PATCH: scriptdir and Scripts

[Clint Adams <clint@xxxxxxx>]

This may be misguided, but sticking newuser in the parent dir of
functions/ seems ugly, and having Scripts/ in $fpath when it doesn't
exist seems pointless at best.

Index: configure.ac
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.ac,v
retrieving revision 1.35
diff -u -r1.35 configure.ac
--- configure.ac	20 Jul 2005 16:08:18 -0000	1.35
+++ configure.ac	26 Jul 2005 14:56:44 -0000
@@ -293,19 +293,19 @@
 [  --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
Index: Src/zsh.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.mdd,v
retrieving revision 1.13
diff -u -r1.13 zsh.mdd
--- Src/zsh.mdd	20 Jul 2005 16:08:22 -0000	1.13
+++ Src/zsh.mdd	26 Jul 2005 14:56:44 -0000
@@ -49,14 +49,14 @@
 	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; \