summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2000-12-04 19:21:05 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2000-12-04 19:21:05 +0000
commitcfe1038ff13f5a6e11dab1fe109edafa274093ac (patch)
tree9afe00ccf64dc95f911f612dd1c68a3eb9a6f3c7 /Src
parent0db6a3103f2285365476f8bc87638261a4422bb4 (diff)
downloadzsh-cfe1038ff13f5a6e11dab1fe109edafa274093ac.tar.gz
zsh-cfe1038ff13f5a6e11dab1fe109edafa274093ac.tar.xz
zsh-cfe1038ff13f5a6e11dab1fe109edafa274093ac.zip
Fix --enable-function-subdirs for new config.modules system.
Diffstat (limited to 'Src')
-rw-r--r--Src/zsh.mdd11
1 files changed, 7 insertions, 4 deletions
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; \