mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-20 06:56:05 +02:00
Code

14401: workaround for script execution under Cygwin

This commit is contained in:
Andrey Borzenkov 2001-05-20 10:59:27 +00:00
parent 2e7937686a
commit 7270c28a39
8 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-05-20 Andrej Borsenkow <bor@zsh.org>
* 14401: Makefile.in, configure.in, Config/config.mk,
Config/installfns.sh, Doc/Makefile.in, Src/Makefile.in,
Src/mkmakemod.sh: do not assume scripts are directly executable
(they are not always on Cygwin) - use `sh script' instead
2001-05-20 Wayne Davison <wayned@users.sourceforge.net> 2001-05-20 Wayne Davison <wayned@users.sourceforge.net>
* last half of 14390: Src/params.c: Added some boundary checks * last half of 14390: Src/params.c: Added some boundary checks

4
Config/config.mk
View File

@ -35,8 +35,8 @@ $(dir_top)/Config/defs.mk $(dir_top)/Config/version.mk
Makefile: Makefile.in $(dir_top)/config.status $(CONFIG_INCS) Makefile: Makefile.in $(dir_top)/config.status $(CONFIG_INCS)
cd $(dir_top) && \ cd $(dir_top) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
$(dir_top)/Config/defs.mk: $(sdir_top)/Config/defs.mk.in $(dir_top)/config.status $(dir_top)/Config/defs.mk: $(sdir_top)/Config/defs.mk.in $(dir_top)/config.status
cd $(dir_top) && \ cd $(dir_top) && \
CONFIG_FILES=Config/defs.mk CONFIG_HEADERS= ./config.status CONFIG_FILES=Config/defs.mk CONFIG_HEADERS= $(SHELL) ./config.status

4
Config/installfns.sh
View File

@ -2,7 +2,7 @@
fndir=$DESTDIR$fndir fndir=$DESTDIR$fndir
$sdir_top/mkinstalldirs $fndir || exit 1; /bin/sh $sdir_top/mkinstalldirs $fndir || exit 1;
allfuncs="`grep ' functions=.' ${dir_top}/config.modules | allfuncs="`grep ' functions=.' ${dir_top}/config.modules |
sed -e '/^#/d' -e '/ link=no/d' -e 's/^.* functions=//'`" sed -e '/^#/d' -e '/ link=no/d' -e 's/^.* functions=//'`"
@ -32,7 +32,7 @@ for file in $allfuncs; do
else else
instdir="$fndir" instdir="$fndir"
fi fi
test -d $instdir || $sdir_top/mkinstalldirs $instdir || exit 1 test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1
$INSTALL_DATA $sdir_top/$file $instdir || exit 1 $INSTALL_DATA $sdir_top/$file $instdir || exit 1
fi fi
done done

6
Doc/Makefile.in
View File

@ -250,7 +250,7 @@ uninstall: uninstall.man
# install man pages, creating install directory if necessary # install man pages, creating install directory if necessary
install.man: man install.man: man
$(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1 ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1
for file in $(MAN); do \ for file in $(MAN); do \
$(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \ $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \
done done
@ -258,7 +258,7 @@ install.man: man
# install info pages, creating install directory if necessary # install info pages, creating install directory if necessary
install.info: texi install.info: texi
$(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
rm -rf infodir rm -rf infodir
mkdir infodir mkdir infodir
if ( \ if ( \
@ -296,7 +296,7 @@ uninstall.info:
# install HTML manual # install HTML manual
install.html: html install.html: html
$(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
for file in zsh_*.html; do \ for file in zsh_*.html; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \ $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \
done done

6
Makefile.in
View File

@ -79,7 +79,7 @@ install.man uninstall.man:
install.fns: install.fns:
if test x$(fndir) != x && test x$(fndir) != xno; then \ if test x$(fndir) != x && test x$(fndir) != xno; then \
test x$(sitefndir) != xno && \ test x$(sitefndir) != xno && \
$(sdir_top)/mkinstalldirs $(DESTDIR)$(sitefndir); \ $(SHELL) $(sdir_top)/mkinstalldirs $(DESTDIR)$(sitefndir); \
sdir_top="$(sdir_top)" fndir="$(fndir)" dir_top="$(dir_top)" \ sdir_top="$(sdir_top)" fndir="$(fndir)" dir_top="$(dir_top)" \
FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \ FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \
INSTALL_DATA="$(INSTALL_DATA)" \ INSTALL_DATA="$(INSTALL_DATA)" \
@ -126,7 +126,7 @@ realclean-here:
config: config.h config: config.h
config.status: $(sdir)/configure config.status: $(sdir)/configure
./config.status --recheck $(SHELL) ./config.status --recheck
$(sdir)/configure: $(sdir)/configure.in $(sdir)/aclocal.m4 $(sdir)/aczsh.m4 $(sdir)/configure: $(sdir)/configure.in $(sdir)/aclocal.m4 $(sdir)/aczsh.m4
cd $(sdir) && autoconf cd $(sdir) && autoconf
@ -134,7 +134,7 @@ $(sdir)/configure: $(sdir)/configure.in $(sdir)/aclocal.m4 $(sdir)/aczsh.m4
config.h: stamp-h config.h: stamp-h
stamp-h: $(sdir)/config.h.in config.status stamp-h: $(sdir)/config.h.in config.status
cd $(dir_top) && \ cd $(dir_top) && \
CONFIG_FILES= CONFIG_HEADERS=$(subdir)/config.h ./config.status CONFIG_FILES= CONFIG_HEADERS=$(subdir)/config.h $(SHELL) ./config.status
$(sdir)/config.h.in: $(sdir)/stamp-h.in $(sdir)/config.h.in: $(sdir)/stamp-h.in
$(sdir)/stamp-h.in: $(sdir)/configure.in $(sdir)/acconfig.h \ $(sdir)/stamp-h.in: $(sdir)/configure.in $(sdir)/acconfig.h \

4
Src/Makefile.in
View File

@ -161,7 +161,7 @@ uninstall.bin: uninstall.bin-here
# install binary, creating install directory if necessary # install binary, creating install directory if necessary
install.bin-here: zsh$(EXEEXT) $(INSTLIB) install.bin-here: zsh$(EXEEXT) $(INSTLIB)
$(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir) ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT)
if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \ if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \
rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \ rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \
@ -174,7 +174,7 @@ install.bin-here: zsh$(EXEEXT) $(INSTLIB)
install.bin-N: install.bin-N:
install.bin-L: $(LIBZSH) install.bin-L: $(LIBZSH)
$(sdir_top)/mkinstalldirs $(DESTDIR)$(libdir)/$(tzsh) ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(libdir)/$(tzsh)
$(INSTALL_PROGRAM) $(LIBZSH) $(DESTDIR)$(libdir)/$(tzsh)/$(LIBZSH) $(INSTALL_PROGRAM) $(LIBZSH) $(DESTDIR)$(libdir)/$(tzsh)/$(LIBZSH)
install.cygwin-lib: $(LIBZSH) install.cygwin-lib: $(LIBZSH)
$(INSTALL_PROGRAM) $(LIBZSH) $(DESTDIR)$(bindir)/$(LIBZSH) $(INSTALL_PROGRAM) $(LIBZSH) $(DESTDIR)$(bindir)/$(LIBZSH)

4
Src/mkmakemod.sh
View File

@ -320,7 +320,7 @@ if $first_stage; then
;; esac ;; esac
instsubdir=`echo $name | sed 's,^,/,;s,/[^/]*$,,'` instsubdir=`echo $name | sed 's,^,/,;s,/[^/]*$,,'`
echo "install.modules.${mddname}: ${mddname}.\$(DL_EXT)" echo "install.modules.${mddname}: ${mddname}.\$(DL_EXT)"
echo " \$(sdir_top)/mkinstalldirs \$(DESTDIR)\$(MODDIR)${instsubdir}" echo " \$(SHELL) \$(sdir_top)/mkinstalldirs \$(DESTDIR)\$(MODDIR)${instsubdir}"
echo " \$(INSTALL_PROGRAM) \$(STRIPFLAGS) ${mddname}.\$(DL_EXT) \$(DESTDIR)\$(MODDIR)/${name}.\$(DL_EXT)" echo " \$(INSTALL_PROGRAM) \$(STRIPFLAGS) ${mddname}.\$(DL_EXT) \$(DESTDIR)\$(MODDIR)/${name}.\$(DL_EXT)"
echo echo
echo "uninstall.modules.${mddname}:" echo "uninstall.modules.${mddname}:"
@ -472,7 +472,7 @@ if $second_stage; then
# tree, this is a problem. zsh's configure script edits config.status, # tree, this is a problem. zsh's configure script edits config.status,
# adding the feature that an input filename starting with "!" has the # adding the feature that an input filename starting with "!" has the
# "!" removed and is not mangled further. # "!" removed and is not mangled further.
CONFIG_FILES=$the_subdir/${the_makefile}:\!$the_subdir/${the_makefile}.in CONFIG_HEADERS= ./config.status CONFIG_FILES=$the_subdir/${the_makefile}:\!$the_subdir/${the_makefile}.in CONFIG_HEADERS= ${CONFIG_SHELL-/bin/sh} ./config.status
fi fi

1
configure.in
View File

@ -1913,6 +1913,7 @@ dnl So add them now. See the comment at the end of Src/mkmakemod.sh.
cp $CONFIG_STATUS $CONFIG_STATUS.old cp $CONFIG_STATUS $CONFIG_STATUS.old
sed '1,$s@^\( *ac_file_inputs=\).*$@\1`echo $ac_file_in | sed -e "s%^%:%" -e "s%:\\([^!]\\)% $ac_given_srcdir/\\1%g" -e "s%:!% %"`@' \ sed '1,$s@^\( *ac_file_inputs=\).*$@\1`echo $ac_file_in | sed -e "s%^%:%" -e "s%:\\([^!]\\)% $ac_given_srcdir/\\1%g" -e "s%:!% %"`@' \
$CONFIG_STATUS.old >$CONFIG_STATUS $CONFIG_STATUS.old >$CONFIG_STATUS
chmod +x $CONFIG_STATUS
rm -f $CONFIG_STATUS.old] rm -f $CONFIG_STATUS.old]
test "$real_no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 test "$real_no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1