diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Config/defs.mk.in | 1 | ||||
| -rwxr-xr-x | Config/installfns.sh | 3 | ||||
| -rwxr-xr-x | Config/uninstallfns.sh | 2 | ||||
| -rw-r--r-- | Src/zsh.mdd | 11 | ||||
| -rw-r--r-- | configure.in | 2 |
6 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index d71e61a96..cd3903cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2000-12-04 Peter Stephenson <pws@csr.com> + * 13226: configure.in, Config/defs.mk, Config/installfns.sh, + Config/uninstallfns.sh, Src/zsh.mdd: fix --enable-function-subdirs + for config.modules system; make Completion get its own functions + subdirectory; tidy up other related bits. + * 13220: Doc/Zsh/params.yo: mention problems with $# e.g. `$#-' in arithmetic. diff --git a/Config/defs.mk.in b/Config/defs.mk.in index fbdb7f9f9..138dea059 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -74,7 +74,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ # variables used in determining what to install -FUNCTIONS_INSTALL = @FUNCTIONS_INSTALL@ FUNCTIONS_SUBDIRS = @FUNCTIONS_SUBDIRS@ # flags passed to recursive makes in subdirectories diff --git a/Config/installfns.sh b/Config/installfns.sh index 54eb3feb4..a0ef6a25b 100755 --- a/Config/installfns.sh +++ b/Config/installfns.sh @@ -14,8 +14,7 @@ allfuncs="`cd $sdir_top; echo ${allfuncs}`" for file in $allfuncs; do if test -f $sdir_top/$file; then if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then - subdir="`echo $file | sed -e 's%/[^/]*$%%' \ - -e s%^Functions/%% -e s%^Completion/%%`" + subdir="`echo $file | sed -e 's%/[^/]*$%%' -e 's%^Functions/%%'`" instdir="$fndir/$subdir" else instdir="$fndir" diff --git a/Config/uninstallfns.sh b/Config/uninstallfns.sh index 963daad66..c45c58b09 100755 --- a/Config/uninstallfns.sh +++ b/Config/uninstallfns.sh @@ -24,7 +24,7 @@ case $fndir in for file in $allfuncs; do if test -f $sdir_top/$file; then if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then - file=`echo $file | sed -e 's%%^Completion/%' -e 's%%^Functions%'` + file=`echo $file | sed -e 's%%^Functions/%'` rm -f $fndir/$file; else bfile="`echo $file | sed -e 's%^.*/%%'`" diff --git a/Src/zsh.mdd b/Src/zsh.mdd index 72db7e059..555b2afe1 100644 --- a/Src/zsh.mdd +++ b/Src/zsh.mdd @@ -45,10 +45,13 @@ zshpaths.h: Makemod $(CONFIG_INCS) echo '#define FPATH_DIR "'$(fndir)'"' >> zshpaths.h.tmp; \ if test x$(FUNCTIONS_SUBDIRS) != x -a \ x$(FUNCTIONS_SUBDIRS) != xno; then \ - fpath_tmp="`for f in $$FUNCTIONS_INSTALL; do \ - echo $$f | sed s%/.*%%; \ - done | sort | uniq`"; \ - fpath_tmp="`echo $$fpath_tmp | sed 's/ /\", \"/g'`"; \ + fpath_tmp="`grep ' functions=.' \ + $(dir_top)/config.modules | sed -e '/^#/d' -e '/ link=no/d' \ + -e 's/^.* functions=//'`"; \ + fpath_tmp=`for f in $$fpath_tmp; do \ + echo $$f | sed -e 's%^Functions/%%' -e 's%/[^/]*$$%%'; \ + done | sort | uniq`; \ + fpath_tmp=`echo $$fpath_tmp | sed 's/ /\", \"/g'`; \ echo "#define FPATH_SUBDIRS { \"$$fpath_tmp\" }" \ >>zshpaths.h.tmp; \ fi; \ diff --git a/configure.in b/configure.in index 9202c6216..9e3cd4c54 100644 --- a/configure.in +++ b/configure.in @@ -1744,7 +1744,7 @@ for modfile in `cd ${srcdir}; echo */*.mdd */*/*.mdd`; do grep "^name=$name " ${CONFIG_MODULES}.old ;; *) case "$link" in - *\ *) eval 'link=`'$link'`' + *\ *) eval "link=\`$link\`" ;; esac case "${load}" in |