mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-07 21:31:17 +02:00
Code Releases Activity

Fix --enable-function-subdirs for new config.modules system.

Browse source
This commit is contained in:
Peter Stephenson 2000-12-04 19:21:05 +00:00
parent 0db6a3103f
commit cfe1038ff1
6 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2000-12-04 Peter Stephenson <pws@csr.com> 2000-12-04 Peter Stephenson <pws@csr.com>
* 13226: configure.in, Config/defs.mk, Config/installfns.sh,
Config/uninstallfns.sh, Src/zsh.mdd: fix --enable-function-subdirs
for config.modules system; make Completion get its own functions
subdirectory; tidy up other related bits.
* 13220: Doc/Zsh/params.yo: mention problems with $# e.g. `$#-' * 13220: Doc/Zsh/params.yo: mention problems with $# e.g. `$#-'
in arithmetic. in arithmetic.

1
Config/defs.mk.in
View file

@ -74,7 +74,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
# variables used in determining what to install # variables used in determining what to install
FUNCTIONS_INSTALL = @FUNCTIONS_INSTALL@
FUNCTIONS_SUBDIRS = @FUNCTIONS_SUBDIRS@ FUNCTIONS_SUBDIRS = @FUNCTIONS_SUBDIRS@
# flags passed to recursive makes in subdirectories # flags passed to recursive makes in subdirectories

3
Config/installfns.sh
View file

@ -14,8 +14,7 @@ allfuncs="`cd $sdir_top; echo ${allfuncs}`"
for file in $allfuncs; do for file in $allfuncs; do
if test -f $sdir_top/$file; then if test -f $sdir_top/$file; then
if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
subdir="`echo $file | sed -e 's%/[^/]*$%%' \ subdir="`echo $file | sed -e 's%/[^/]*$%%' -e 's%^Functions/%%'`"
-e s%^Functions/%% -e s%^Completion/%%`"
instdir="$fndir/$subdir" instdir="$fndir/$subdir"
else else
instdir="$fndir" instdir="$fndir"

2
Config/uninstallfns.sh
View file

@ -24,7 +24,7 @@ case $fndir in
for file in $allfuncs; do for file in $allfuncs; do
if test -f $sdir_top/$file; then if test -f $sdir_top/$file; then
if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
file=`echo $file | sed -e 's%%^Completion/%' -e 's%%^Functions%'` file=`echo $file | sed -e 's%%^Functions/%'`
rm -f $fndir/$file; rm -f $fndir/$file;
else else
bfile="`echo $file | sed -e 's%^.*/%%'`" bfile="`echo $file | sed -e 's%^.*/%%'`"

11
Src/zsh.mdd
View file

@ -45,10 +45,13 @@ zshpaths.h: Makemod $(CONFIG_INCS)
echo '#define FPATH_DIR "'$(fndir)'"' >> zshpaths.h.tmp; \ echo '#define FPATH_DIR "'$(fndir)'"' >> zshpaths.h.tmp; \
if test x$(FUNCTIONS_SUBDIRS) != x -a \ if test x$(FUNCTIONS_SUBDIRS) != x -a \
x$(FUNCTIONS_SUBDIRS) != xno; then \ x$(FUNCTIONS_SUBDIRS) != xno; then \
fpath_tmp="`for f in $$FUNCTIONS_INSTALL; do \ fpath_tmp="`grep ' functions=.' \
echo $$f | sed s%/.*%%; \ $(dir_top)/config.modules | sed -e '/^#/d' -e '/ link=no/d' \
done | sort | uniq`"; \ -e 's/^.* functions=//'`"; \
fpath_tmp="`echo $$fpath_tmp | sed 's/ /\", \"/g'`"; \ 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\" }" \ echo "#define FPATH_SUBDIRS { \"$$fpath_tmp\" }" \
>>zshpaths.h.tmp; \ >>zshpaths.h.tmp; \
fi; \ fi; \

2
configure.in
View file

@ -1744,7 +1744,7 @@ for modfile in `cd ${srcdir}; echo */*.mdd */*/*.mdd`; do
grep "^name=$name " ${CONFIG_MODULES}.old grep "^name=$name " ${CONFIG_MODULES}.old
;; ;;
*) case "$link" in *) case "$link" in
*\ *) eval 'link=`'$link'`' *\ *) eval "link=\`$link\`"
;; ;;
esac esac
case "${load}" in case "${load}" in