about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--Config/config.mk4
-rwxr-xr-xConfig/installfns.sh4
-rw-r--r--Doc/Makefile.in6
-rw-r--r--Makefile.in6
-rw-r--r--Src/Makefile.in4
-rw-r--r--Src/mkmakemod.sh4
-rw-r--r--configure.in1
8 files changed, 22 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index d2d75f0be..bb25b7baa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* last half of 14390: Src/params.c: Added some boundary checks
diff --git a/Config/config.mk b/Config/config.mk
index 8e5c59c88..476ced11d 100644
--- a/Config/config.mk
+++ b/Config/config.mk
@@ -35,8 +35,8 @@ $(dir_top)/Config/defs.mk $(dir_top)/Config/version.mk
 
 Makefile: Makefile.in $(dir_top)/config.status $(CONFIG_INCS)
 	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
 	cd $(dir_top) && \
-	  CONFIG_FILES=Config/defs.mk CONFIG_HEADERS= ./config.status
+	  CONFIG_FILES=Config/defs.mk CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/Config/installfns.sh b/Config/installfns.sh
index 886185409..ccbeae6d5 100755
--- a/Config/installfns.sh
+++ b/Config/installfns.sh
@@ -2,7 +2,7 @@
 
 fndir=$DESTDIR$fndir
 
-$sdir_top/mkinstalldirs $fndir || exit 1;
+/bin/sh $sdir_top/mkinstalldirs $fndir || exit 1;
 
 allfuncs="`grep ' functions=.' ${dir_top}/config.modules |
   sed -e '/^#/d' -e '/ link=no/d' -e 's/^.* functions=//'`"
@@ -32,7 +32,7 @@ for file in $allfuncs; do
     else
       instdir="$fndir"
     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
   fi
 done
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index d0e593066..d39777d72 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -250,7 +250,7 @@ uninstall: uninstall.man
 
 # install man pages, creating install directory if necessary
 install.man: man
-	$(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+	${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1
 	for file in $(MAN); do \
 	    $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \
 	done
@@ -258,7 +258,7 @@ install.man: man
 
 # install info pages, creating install directory if necessary
 install.info: texi
-	$(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
+	${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
 	rm -rf infodir
 	mkdir infodir
 	if ( \
@@ -296,7 +296,7 @@ uninstall.info:
 
 # install HTML manual
 install.html: html
-	$(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
+	${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
 	for file in zsh_*.html; do \
 	    $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \
 	done
diff --git a/Makefile.in b/Makefile.in
index 16e2ac919..09e85f4ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,7 @@ install.man uninstall.man:
 install.fns:
 	if test x$(fndir) != x && test x$(fndir) != xno; then \
 	  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)" \
 	  FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \
 	  INSTALL_DATA="$(INSTALL_DATA)" \
@@ -126,7 +126,7 @@ realclean-here:
 config: config.h
 
 config.status: $(sdir)/configure
-	./config.status --recheck
+	$(SHELL) ./config.status --recheck
 
 $(sdir)/configure: $(sdir)/configure.in $(sdir)/aclocal.m4 $(sdir)/aczsh.m4
 	cd $(sdir) && autoconf
@@ -134,7 +134,7 @@ $(sdir)/configure: $(sdir)/configure.in $(sdir)/aclocal.m4 $(sdir)/aczsh.m4
 config.h: stamp-h
 stamp-h: $(sdir)/config.h.in config.status
 	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)/stamp-h.in: $(sdir)/configure.in $(sdir)/acconfig.h \
diff --git a/Src/Makefile.in b/Src/Makefile.in
index faa10cbfe..b1383f650 100644
--- a/Src/Makefile.in
+++ b/Src/Makefile.in
@@ -161,7 +161,7 @@ uninstall.bin: uninstall.bin-here
 
 # install binary, creating install directory if necessary
 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)
 	if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \
 	    rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \
@@ -174,7 +174,7 @@ install.bin-here: zsh$(EXEEXT) $(INSTLIB)
 
 install.bin-N:
 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.cygwin-lib: $(LIBZSH)
 	$(INSTALL_PROGRAM) $(LIBZSH) $(DESTDIR)$(bindir)/$(LIBZSH)
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh
index e80e65819..a912a307b 100644
--- a/Src/mkmakemod.sh
+++ b/Src/mkmakemod.sh
@@ -320,7 +320,7 @@ if $first_stage; then
 	    ;; esac
 	    instsubdir=`echo $name | sed 's,^,/,;s,/[^/]*$,,'`
 	    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
 	    echo "uninstall.modules.${mddname}:"
@@ -472,7 +472,7 @@ if $second_stage; then
     # tree, this is a problem.  zsh's configure script edits config.status,
     # adding the feature that an input filename starting with "!" has the
     # "!" 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
 
diff --git a/configure.in b/configure.in
index 6ae0522f8..d35a43f19 100644
--- a/configure.in
+++ b/configure.in
@@ -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
 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
+ chmod +x $CONFIG_STATUS
  rm -f $CONFIG_STATUS.old]
 
 test "$real_no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-04-29 18:25:26 +0000