mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

21529: move scriptdir to a scripts subdir, and don't include Scripts in fpath.

Browse source
This commit is contained in:
Clint Adams 2005-07-26 15:01:40 +00:00
parent 022758c7c4
commit e6fdd78a18
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

6
Src/zsh.mdd
View file

@ -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; \

8
configure.ac
View file

@ -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