From e6fdd78a182abf413d801b1bd93e75d4890c7d19 Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@users.sourceforge.net>
Date: Tue, 26 Jul 2005 15:01:40 +0000
Subject: 21529: move scriptdir to a scripts subdir, and don't include Scripts
 in fpath.

---
 ChangeLog    | 5 +++++
 Src/zsh.mdd  | 6 +++---
 configure.ac | 8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13180377d..01e0ca2ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Clint Adams  <clint@zsh.org>
+
+	* 21529: configure.ac, Src/zsh.mdd: move scriptdir to a scripts
+	subdir, and don't include Scripts in fpath.
+
 2005-07-26  Doug Kearns  <djkea2@gus.gscit.monash.edu.au>
 
 	* unposted: Completion/Unix/Command/_rake: declare expl local
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; \
diff --git a/configure.ac b/configure.ac
index 6399f53c5..32230b3c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,19 +293,19 @@ AC_ARG_ENABLE(scriptdir,
 [  --enable-scriptdir=DIR     the directory in which to install scripts],
 dnl ${VERSION} to be determined at compile time.
 [if test $enableval = yes; then
-  scriptdir=${datadir}/${tzsh_name}/'${VERSION}'
+  scriptdir=${datadir}/${tzsh_name}/'${VERSION}'/scripts
 else
   scriptdir="$enableval"
-fi], [scriptdir=${datadir}/${tzsh_name}/'${VERSION}'])
+fi], [scriptdir=${datadir}/${tzsh_name}/'${VERSION}'/scripts])
 
 ifdef([sitescriptdir],[undefine([sitescriptdir])])dnl
 AC_ARG_ENABLE(site-scriptdir,
 [  --enable-site-scriptdir=DIR  same for site scripts (not version specific)],
 [if test $enableval = yes; then
-  sitescriptdir=${datadir}/${tzsh_name}
+  sitescriptdir=${datadir}/${tzsh_name}/scripts
 else
   sitescriptdir="$enableval"
-fi], [sitescriptdir=${datadir}/${tzsh_name}])
+fi], [sitescriptdir=${datadir}/${tzsh_name}/scripts])
 
 AC_SUBST(scriptdir)dnl
 AC_SUBST(sitescriptdir)dnl
-- 
cgit 1.4.1