summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2005-07-26 15:01:40 +0000
committerClint Adams <clint@users.sourceforge.net>2005-07-26 15:01:40 +0000
commite6fdd78a182abf413d801b1bd93e75d4890c7d19 (patch)
tree2f9cf74edd714bf142dc8807dde8dffe28f21a90 /Src
parent022758c7c4b810ea510bc1f4050065ad819045d4 (diff)
downloadzsh-e6fdd78a182abf413d801b1bd93e75d4890c7d19.tar.gz
zsh-e6fdd78a182abf413d801b1bd93e75d4890c7d19.tar.xz
zsh-e6fdd78a182abf413d801b1bd93e75d4890c7d19.zip
21529: move scriptdir to a scripts subdir, and don't include Scripts in fpath.
Diffstat (limited to 'Src')
-rw-r--r--Src/zsh.mdd6
1 files changed, 3 insertions, 3 deletions
diff --git a/Src/zsh.mdd b/Src/zsh.mdd
index 3109e6b38..41602ed7e 100644
--- a/Src/zsh.mdd
+++ b/Src/zsh.mdd
@@ -49,14 +49,14 @@ zshpaths.h: Makemod $(CONFIG_INCS)
 	fi
 	@if test x$(fndir) != xno; then \
 	  echo '#define FPATH_DIR "'$(fndir)'"' >> zshpaths.h.tmp; \
-	  if test x$(FUNCTIONS_SUBDIRS) != x -a \
-	  x$(FUNCTIONS_SUBDIRS) != xno; then \
+	  if test x$(FUNCTIONS_SUBDIRS) != x && \
+	     test x$(FUNCTIONS_SUBDIRS) != xno; then \
 	    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%/[^/]*$$%%' -e 's%/\*%%'; \
-	    done | sort | uniq`; \
+	    done | grep -v Scripts | sort | uniq`; \
 	    fpath_tmp=`echo $$fpath_tmp | sed 's/ /\", \"/g'`; \
 	    echo "#define FPATH_SUBDIRS { \"$$fpath_tmp\" }" \
 	    >>zshpaths.h.tmp; \