Invoke sh move-if-change explicitly.

Official patch, submitted to egcs and accepted in the main source.
(strongly suggested by mickey@)

6 files changed, 31 insertions, 24 deletions

diff --git a/gnu/egcs/gcc/Makefile.in b/gnu/egcs/gcc/Makefile.in
index 3be29856bdc..cab7cd7143c 100644
--- a/gnu/egcs/gcc/Makefile.in
+++ b/gnu/egcs/gcc/Makefile.in
@@ -1186,7 +1186,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.
@@ -1332,12 +1332,12 @@ 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 c-parse.y
+	$(SHELL) $(srcdir)/move-if-change tmp-c-parse.y 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 \
 #	   -k1,3,$$ $(srcdir)/c-parse.gperf >tmp-gperf.h
-#	 $(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-lex.h flags.h \
     output.h toplev.h
@@ -1397,7 +1397,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
 
@@ -1426,7 +1426,7 @@ cppspec.o: cppspec.c $(CONFIG_H) system.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)
@@ -1651,19 +1651,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 \
@@ -1673,7 +1673,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) \
@@ -1683,7 +1683,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 \
@@ -1693,7 +1693,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 \
@@ -1703,7 +1703,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 \
@@ -1713,7 +1713,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 \
@@ -1723,7 +1723,7 @@ 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
@@ -1735,7 +1735,7 @@ s-attrtab : $(md_file) genattrtab $(srcdir)/move-if-change
 	else					\
 	  ./genattrtab $(md_file) > tmp-attrtab.c;	\
 	fi
-	$(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 \
@@ -1746,7 +1746,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
@@ -1755,8 +1755,8 @@ genrtl.c genrtl.h : s-genrtl
 
 s-genrtl: gengenrtl $(srcdir)/move-if-change $(RTL_BASE_H)
 	./gengenrtl tmp-genrtl.h tmp-genrtl.c
-	$(srcdir)/move-if-change tmp-genrtl.h genrtl.h
-	$(srcdir)/move-if-change tmp-genrtl.c genrtl.c
+	$(SHELL) $(srcdir)/move-if-change tmp-genrtl.h genrtl.h
+	$(SHELL) $(srcdir)/move-if-change tmp-genrtl.c genrtl.c
 	touch s-genrtl
 
 #
diff --git a/gnu/egcs/gcc/config/msdos/top.sed b/gnu/egcs/gcc/config/msdos/top.sed
index 64027f55355..b1398a92ce5 100644
--- a/gnu/egcs/gcc/config/msdos/top.sed
+++ b/gnu/egcs/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/gnu/egcs/gcc/config/winnt/config-nt.sed b/gnu/egcs/gcc/config/winnt/config-nt.sed
index 9beceabf2ec..23a05ddc373 100644
--- a/gnu/egcs/gcc/config/winnt/config-nt.sed
+++ b/gnu/egcs/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\
diff --git a/gnu/egcs/gcc/cp/Makefile.in b/gnu/egcs/gcc/cp/Makefile.in
index 9f2cd1c3c97..9fa7860a5e5 100644
--- a/gnu/egcs/gcc/cp/Makefile.in
+++ b/gnu/egcs/gcc/cp/Makefile.in
@@ -236,8 +236,8 @@ $(PARSE_C) : $(srcdir)/parse.y
 #	@echo $(CONFLICTS)
 #	$(BISON) $(BISONFLAGS) -d $(srcdir)/parse.y
 #	grep '^#define[ 	]*YYEMPTY' y.tab.c >>y.tab.h
-#	$(srcdir)/../move-if-change y.tab.c $(PARSE_C)
-#	$(srcdir)/../move-if-change y.tab.h $(PARSE_H)
+#	$(SHELL) $(srcdir)/../move-if-change y.tab.c $(PARSE_C)
+#	$(SHELL) $(srcdir)/../move-if-change y.tab.h $(PARSE_H)
 #	cp $(PARSE_C) y.tab.c
 #	touch stamp-parse
 
diff --git a/gnu/egcs/gcc/objc/Make-lang.in b/gnu/egcs/gcc/objc/Make-lang.in
index 773116f73ab..6a9005f9e21 100644
--- a/gnu/egcs/gcc/objc/Make-lang.in
+++ b/gnu/egcs/gcc/objc/Make-lang.in
@@ -80,7 +80,7 @@ objc-parse.y: $(srcdir)/c-parse.in
 	sed -e "/^ifc$$/,/^end ifc$$/d" \
 	  -e "/^ifobjc$$/d" -e "/^end ifobjc$$/d" \
 	  $(srcdir)/c-parse.in >>tmp-objc-prs.y
-	$(srcdir)/move-if-change tmp-objc-prs.y objc-parse.y
+	$(SHELL) $(srcdir)/move-if-change tmp-objc-prs.y objc-parse.y
 
 objc-act.o : $(srcdir)/objc/objc-act.c \
    $(CONFIG_H) $(TREE_H) $(RTL_H) system.h \
diff --git a/gnu/egcs/libf2c/Makefile.in b/gnu/egcs/libf2c/Makefile.in
index 7c8d880ea20..9075360fe9b 100644
--- a/gnu/egcs/libf2c/Makefile.in
+++ b/gnu/egcs/libf2c/Makefile.in
@@ -67,7 +67,12 @@ FLAGS_TO_PASS= \
 	AR='$(AR)' \
 	RANLIB='$(RANLIB)' \
 	PICFLAG='$(PICFLAG)' \
-	RUNTESTFLAGS='$(RUNTESTFLAGS)'
+	RUNTESTFLAGS='$(RUNTESTFLAGS)' \
+	prefix='$(prefix)' \
+	exec_prefix='$(exec_prefix)' \
+	libdir='$(libdir)' \
+	libsubdir='$(libsubdir)' \
+	tooldir='$(tooldir)'
 
 LIBG2C = libg2c.a
 
@@ -174,7 +179,7 @@ g2c.h: g2c.hin config.status Makefile
 # lines below, since g2c.h isn't necessarily brought up to date.
 #	mv g2c.h g2c.x
 	$(SHELL) config.status
-#	$(srcdir)/../move-if-change g2c.h g2c.x && mv g2c.x g2c.h
+#	$(SHELL) $(srcdir)/../move-if-change g2c.h g2c.x && mv g2c.x g2c.h
 
 Makefile: Makefile.in config.status
 # Autoconf doc uses `./config.status'.  Is there a good reason to use $(SHELL)?