diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2000-12-04 19:21:05 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2000-12-04 19:21:05 +0000 |
| commit | cfe1038ff13f5a6e11dab1fe109edafa274093ac (patch) | |
| tree | 9afe00ccf64dc95f911f612dd1c68a3eb9a6f3c7 /Config | |
| parent | 0db6a3103f2285365476f8bc87638261a4422bb4 (diff) | |
| download | zsh-cfe1038ff13f5a6e11dab1fe109edafa274093ac.tar.gz zsh-cfe1038ff13f5a6e11dab1fe109edafa274093ac.tar.xz zsh-cfe1038ff13f5a6e11dab1fe109edafa274093ac.zip | |
Fix --enable-function-subdirs for new config.modules system.
Diffstat (limited to 'Config')
| -rw-r--r-- | Config/defs.mk.in | 1 | ||||
| -rwxr-xr-x | Config/installfns.sh | 3 | ||||
| -rwxr-xr-x | Config/uninstallfns.sh | 2 |
3 files changed, 2 insertions, 4 deletions
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%^.*/%%'`" |