* Makefile.in: Prepend $(SHELL) to move-if-change calls.

        * msdos/top.sed:  Take into account a prepended $(SHELL) to
        move-if-change.
        * winnt/config-nt.sed:  Likewise.  Kill bogus substitution.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29395 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 28 insertions, 19 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 37e12e6403b..0d9074d6c8e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 14 01:42:27 1999  Marc Espie <espie@cvs.openbsd.org>
+
+	* Makefile.in:  Prepend $(SHELL) to move-if-change calls.
+	* msdos/top.sed:  Take into account a prepended $(SHELL) to
+	move-if-change.
+	* winnt/config-nt.sed:  Likewise.  Kill bogus substitution.
+
 Tue Sep 14 01:38:52 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* regmove.c (fixup_match_1): Don't change an unchanging register.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 25a962fa7c6..d8000001d02 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1187,7 +1187,7 @@ s-mlib: $(srcdir)/genmultilib Makefile
 	  "$(MULTILIB_MATCHES)" \
 	  "$(MULTILIB_EXCEPTIONS)" \
 	  "$(MULTILIB_EXTRA_OPTS)" > tmp-mlib.h
-	$(srcdir)/move-if-change tmp-mlib.h multilib.h
+	$(SHELL) $(srcdir)/move-if-change tmp-mlib.h multilib.h
 	touch s-mlib
 
 # Build multiple copies of libgcc.a, one for each target switch.
@@ -1333,7 +1333,7 @@ $(srcdir)/c-parse.y: c-parse.in
 	sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
 	  -e "/^ifc$$/d" -e "/^end ifc$$/d" \
 	  $(srcdir)/c-parse.in >>tmp-c-parse.y
-	$(srcdir)/move-if-change tmp-c-parse.y $(srcdir)/c-parse.y
+	$(SHELL) $(srcdir)/move-if-change tmp-c-parse.y $(srcdir)/c-parse.y
 
 $(srcdir)/c-gperf.h: c-parse.gperf
 	gperf -L C -F ', 0, 0' -p -j1 -i 1 -g -o -t -G -N is_reserved_word \
@@ -1341,7 +1341,7 @@ $(srcdir)/c-gperf.h: c-parse.gperf
 	echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
 	echo "	ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
 	exit 1 )
-	 $(srcdir)/move-if-change tmp-gperf.h $(srcdir)/c-gperf.h
+	 $(SHELL) $(srcdir)/move-if-change tmp-gperf.h $(srcdir)/c-gperf.h
 
 c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h ggc.h \
     c-lex.h flags.h function.h output.h toplev.h defaults.h
@@ -1401,7 +1401,7 @@ s-under: $(GCC_PASSES)
 	else \
 	  echo "int prepends_underscore = 0;" >>tmp-under.c; \
 	fi
-	$(srcdir)/move-if-change tmp-under.c underscore.c
+	$(SHELL) $(srcdir)/move-if-change tmp-under.c underscore.c
 	-rm -f tmp-dum.c tmp-dum.s
 	touch s-under
 
@@ -1430,7 +1430,7 @@ cppspec.o: cppspec.c $(CONFIG_H) system.h gcc.h
 tree-check.h: s-check ; @true
 s-check : gencheck $(srcdir)/move-if-change
 	./gencheck > tmp-check.h
-	$(srcdir)/move-if-change tmp-check.h tree-check.h
+	$(SHELL) $(srcdir)/move-if-change tmp-check.h tree-check.h
 	touch s-check
 
 gencheck : gencheck.o $(lang_tree_files) $(HOST_LIBDEPS)
@@ -1673,19 +1673,19 @@ alloca.o:	$(srcdir)/../libiberty/alloca.c
 insn-config.h: s-config ; @true
 s-config : $(md_file) genconfig $(srcdir)/move-if-change
 	./genconfig $(md_file) > tmp-config.h
-	$(srcdir)/move-if-change tmp-config.h insn-config.h
+	$(SHELL) $(srcdir)/move-if-change tmp-config.h insn-config.h
 	touch s-config
 
 insn-flags.h: s-flags ; @true
 s-flags : $(md_file) genflags $(srcdir)/move-if-change
 	./genflags $(md_file) > tmp-flags.h
-	$(srcdir)/move-if-change tmp-flags.h insn-flags.h
+	$(SHELL) $(srcdir)/move-if-change tmp-flags.h insn-flags.h
 	touch s-flags
 
 insn-codes.h: s-codes ; @true
 s-codes : $(md_file) gencodes $(srcdir)/move-if-change
 	./gencodes $(md_file) > tmp-codes.h
-	$(srcdir)/move-if-change tmp-codes.h insn-codes.h
+	$(SHELL) $(srcdir)/move-if-change tmp-codes.h insn-codes.h
 	touch s-codes
 
 insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) $(EXPR_H) real.h output.h \
@@ -1695,7 +1695,7 @@ insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) $(EXPR_H) real.h output.h \
 insn-emit.c: s-emit ; @true
 s-emit : $(md_file) genemit $(srcdir)/move-if-change
 	./genemit $(md_file) > tmp-emit.c
-	$(srcdir)/move-if-change tmp-emit.c insn-emit.c
+	$(SHELL) $(srcdir)/move-if-change tmp-emit.c insn-emit.c
 	touch s-emit
 
 insn-recog.o : insn-recog.c $(CONFIG_H) $(RTL_H) insn-config.h $(RECOG_H) \
@@ -1705,7 +1705,7 @@ insn-recog.o : insn-recog.c $(CONFIG_H) $(RTL_H) insn-config.h $(RECOG_H) \
 insn-recog.c: s-recog ; @true
 s-recog : $(md_file) genrecog $(srcdir)/move-if-change
 	./genrecog $(md_file) > tmp-recog.c
-	$(srcdir)/move-if-change tmp-recog.c insn-recog.c
+	$(SHELL) $(srcdir)/move-if-change tmp-recog.c insn-recog.c
 	touch s-recog
 
 insn-opinit.o : insn-opinit.c $(CONFIG_H) $(RTL_H) insn-codes.h insn-flags.h \
@@ -1715,7 +1715,7 @@ insn-opinit.o : insn-opinit.c $(CONFIG_H) $(RTL_H) insn-codes.h insn-flags.h \
 insn-opinit.c: s-opinit ; @true
 s-opinit : $(md_file) genopinit $(srcdir)/move-if-change
 	./genopinit $(md_file) > tmp-opinit.c
-	$(srcdir)/move-if-change tmp-opinit.c insn-opinit.c
+	$(SHELL) $(srcdir)/move-if-change tmp-opinit.c insn-opinit.c
 	touch s-opinit
 
 insn-extract.o : insn-extract.c $(CONFIG_H) $(RTL_H) system.h toplev.h \
@@ -1725,7 +1725,7 @@ insn-extract.o : insn-extract.c $(CONFIG_H) $(RTL_H) system.h toplev.h \
 insn-extract.c: s-extract ; @true
 s-extract : $(md_file) genextract $(srcdir)/move-if-change
 	./genextract $(md_file) > tmp-extract.c
-	$(srcdir)/move-if-change tmp-extract.c insn-extract.c
+	$(SHELL) $(srcdir)/move-if-change tmp-extract.c insn-extract.c
 	touch s-extract
 
 insn-peep.o : insn-peep.c $(CONFIG_H) $(RTL_H) $(REGS_H) output.h real.h \
@@ -1735,7 +1735,7 @@ insn-peep.o : insn-peep.c $(CONFIG_H) $(RTL_H) $(REGS_H) output.h real.h \
 insn-peep.c: s-peep ; @true
 s-peep : $(md_file) genpeep $(srcdir)/move-if-change
 	./genpeep $(md_file) > tmp-peep.c
-	$(srcdir)/move-if-change tmp-peep.c insn-peep.c
+	$(SHELL) $(srcdir)/move-if-change tmp-peep.c insn-peep.c
 	touch s-peep
 
 insn-attrtab.o : insn-attrtab.c $(CONFIG_H) $(RTL_H) $(REGS_H) real.h \
@@ -1745,13 +1745,13 @@ insn-attrtab.o : insn-attrtab.c $(CONFIG_H) $(RTL_H) $(REGS_H) real.h \
 insn-attr.h: s-attr ; @true
 s-attr : $(md_file) genattr $(srcdir)/move-if-change
 	./genattr $(md_file) > tmp-attr.h
-	$(srcdir)/move-if-change tmp-attr.h insn-attr.h
+	$(SHELL) $(srcdir)/move-if-change tmp-attr.h insn-attr.h
 	touch s-attr
 
 insn-attrtab.c: s-attrtab ; @true
 s-attrtab : $(md_file) genattrtab $(srcdir)/move-if-change
 	./genattrtab $(md_file) > tmp-attrtab.c
-	$(srcdir)/move-if-change tmp-attrtab.c insn-attrtab.c
+	$(SHELL) $(srcdir)/move-if-change tmp-attrtab.c insn-attrtab.c
 	touch s-attrtab
 
 insn-output.o : insn-output.c $(CONFIG_H) $(RTL_H) $(REGS_H) real.h conditions.h \
@@ -1762,7 +1762,7 @@ insn-output.o : insn-output.c $(CONFIG_H) $(RTL_H) $(REGS_H) real.h conditions.h
 insn-output.c: s-output ; @true
 s-output : $(md_file) genoutput $(srcdir)/move-if-change
 	./genoutput $(md_file) > tmp-output.c
-	$(srcdir)/move-if-change tmp-output.c insn-output.c
+	$(SHELL) $(srcdir)/move-if-change tmp-output.c insn-output.c
 	touch s-output
 
 genrtl.o : genrtl.c $(CONFIG_H) $(RTL_H) system.h
@@ -1771,9 +1771,9 @@ genrtl.c genrtl.h : s-genrtl
 
 s-genrtl: gengenrtl $(srcdir)/move-if-change $(RTL_BASE_H)
 	./gengenrtl -h >tmp-genrtl.h
-	$(srcdir)/move-if-change tmp-genrtl.h genrtl.h
+	$(SHELL) $(srcdir)/move-if-change tmp-genrtl.h genrtl.h
 	./gengenrtl >tmp-genrtl.c
-	$(srcdir)/move-if-change tmp-genrtl.c genrtl.c
+	$(SHELL) $(srcdir)/move-if-change tmp-genrtl.c genrtl.c
 	touch s-genrtl
 #
 # Compile the programs that generate insn-* from the machine description.
diff --git a/gcc/config/msdos/top.sed b/gcc/config/msdos/top.sed
index 64027f55355..b1398a92ce5 100644
--- a/gcc/config/msdos/top.sed
+++ b/gcc/config/msdos/top.sed
@@ -26,6 +26,7 @@ s/CC = cc/CC = gcc/
 s/:\$/: \$/g
 s/^	\ *\.\//	/
 s/<\ *\$(srcdir)\//< $(srcdir)\\/g
+s/^	\$(SHELL) \$(srcdir)\/move-if-change/	update/
 s/^	\$(srcdir)\/move-if-change/	update/
 s/^USE_/# USE_/
 s/`echo \$(srcdir)\///g
diff --git a/gcc/config/winnt/config-nt.sed b/gcc/config/winnt/config-nt.sed
index 9beceabf2ec..23a05ddc373 100644
--- a/gcc/config/winnt/config-nt.sed
+++ b/gcc/config/winnt/config-nt.sed
@@ -19,6 +19,7 @@ s/^SHELL =.*/SHELL =/
 s/CFLAGS = -g/CFLAGS =/
 s/:\$/: \$/g
 s/<\ *\$(srcdir)\//< $(srcdir)\\/g
+s/^	\$(SHELL) \$(srcdir)\/move-if-change/	copy/
 s/^	\$(srcdir)\/move-if-change/	copy/
 s/^USE_/# USE_/
 s/`echo \$(srcdir)\///g
@@ -79,8 +80,8 @@ s/\${SYSTEM_HEADER_DIR}/\$(SYSTEM_HEADER_DIR)/g
 s/\${HOST_CC}/\$(HOST_CC)/g
 s/ \${srcdir}\// /g
 s/\${mainversion}/\$(mainversion)/g
-s/\ $(srcdir)\/move-if-change$//
 s/\$(srcdir)\/move-if-change/copy/g
+s/\$(SHELL) \$(srcdir)\/move-if-change/copy/g
 /^# USE_HOST_OBSTACK/ i\
 USE_HOST_OBSTACK=obstack.obj
 /^# USE_ALLOCA/ i\