diff options
Diffstat (limited to 'Config')
-rw-r--r-- | Config/.distfiles | 2 | ||||
-rw-r--r-- | Config/config.mk | 2 | ||||
-rw-r--r-- | Config/defs.mk.in | 7 | ||||
-rw-r--r-- | Config/version.mk | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/Config/.distfiles b/Config/.distfiles index eb59d5ee3..cedbd27cf 100644 --- a/Config/.distfiles +++ b/Config/.distfiles @@ -1,4 +1,4 @@ DISTFILES_SRC=' - .distfiles + .distfiles .cvsignore clean.mk config.mk defs.mk.in version.mk ' diff --git a/Config/config.mk b/Config/config.mk index dd91476d0..f997bf478 100644 --- a/Config/config.mk +++ b/Config/config.mk @@ -25,7 +25,7 @@ # config: Makefile - @subdir='$(SUBDIRS)'; for subdir in $$subdirs; do \ + @subdirs='$(SUBDIRS)'; for subdir in $$subdirs; do \ (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \ done diff --git a/Config/defs.mk.in b/Config/defs.mk.in index 3394123d5..27c9aea99 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -36,6 +36,7 @@ libdir = @libdir@ MODDIR = $(libdir)/zsh/$(VERSION) infodir = @infodir@ mandir = @mandir@ +fndir = @fndir@ # compilation CC = @CC@ @@ -65,6 +66,9 @@ YODL2HTML = $(YODL)2html INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +# variables used in determining what to install +FUNCTIONS_INSTALL = @FUNCTIONS_INSTALL@ + # flags passed to recursive makes in subdirectories MAKEDEFS = \ prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \ @@ -74,7 +78,8 @@ LDFLAGS='$(LDFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' \ DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \ LIBLDFLAGS='$(LIBLDFLAGS)' EXELDFLAGS='$(EXELDFLAGS)' \ LIBS='$(LIBS)' DL_EXT='$(DL_EXT)' DLLD='$(DLLD)' \ -AWK='$(AWK)' YODL='$(YODL)' YODL2TXT='$(YODL2TXT)' YODL2HTML='$(YODL2HTML)' +AWK='$(AWK)' YODL='$(YODL)' YODL2TXT='$(YODL2TXT)' YODL2HTML='$(YODL2HTML)' \ +FUNCTIONS_INSTALL='$(FUNCTIONS_INSTALL)' # override built-in suffix list .SUFFIXES: diff --git a/Config/version.mk b/Config/version.mk index cd9e33110..3e6726141 100644 --- a/Config/version.mk +++ b/Config/version.mk @@ -27,5 +27,5 @@ # This must also serve as a shell script, so do not add spaces around the # `=' signs. -VERSION=3.1.5-pws-20 -VERSION_DATE='May 25, 1999' +VERSION=3.1.5-pws-21 +VERSION_DATE='June 6, 1999' |