Makefile.in: Set SHELL.

	* fixinc/Makefile.in: Set SHELL.

        * fixinc/fixincl.c (fix_with_system): Quote file names before
        passing them to shell.

        * Makefile.in: Use fix-header$(build_exeext) instead
        of fix-header.

From-SVN: r40561

4 files changed, 22 insertions, 6 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 212cf38..887e3a9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2001-03-16  Laurynas Biveinis  <lauras@softhome.net>
+
+	* fixinc/Makefile.in: Set SHELL.
+
+2001-03-16  Laurynas Biveinis  <lauras@softhome.net>
+
+	* fixinc/fixincl.c (fix_with_system): Quote file names before
+	passing them to shell.
+		 
+2001-03-16  Laurynas Biveinis  <lauras@softhome.net>
+
+	* Makefile.in: Use fix-header$(build_exeext) instead
+	of fix-header.
+	
 2001-03-16  Richard Henderson  <rth@redhat.com>
 
 	* dwarf2out.c: Revert most of 2000-11-25 and 2001-01-24 changes.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 44a892f..6c39afd 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2172,8 +2172,8 @@ xsys-protos.h: $(GCC_PASSES) $(srcdir)/sys-protos.h deduced.h gen-protos$(build_
 
 # This is nominally a 'build' program, but it's run only when host==build,
 # so we can (indeed, must) use $(LIBDEPS) and $(LIBS).
-fix-header: fix-header.o scan-decls.o scan.o xsys-protos.h $(LIBDEPS) \
-	    libcpp.a
+fix-header$(build_exeext): fix-header.o scan-decls.o scan.o xsys-protos.h \
+           $(LIBDEPS) libcpp.a
 	$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ fix-header.o \
 	   scan-decls.o scan.o libcpp.a $(LIBS)
 
@@ -2188,7 +2188,7 @@ scan-decls.o: scan-decls.c scan.h cpplib.h $(HCONFIG_H) system.h
 # The idea is to make sure fix-header gets built,
 # but not rerun fixproto after each stage
 # just because fix-header's mtime has changed.
-fixhdr.ready: fix-header
+fixhdr.ready: fix-header$(build_exeext)
 	-if [ -f fixhdr.ready ] ; then \
 		true; \
 	else \
@@ -2310,7 +2310,7 @@ mostlyclean: $(INTL_MOSTLYCLEAN) lang.mostlyclean
 	-rm -f specs float.h-* enquire SYSCALLS.c.X SYSCALLS.c
 	-rm -f collect collect2 mips-tfile mips-tdump
 # Delete files generated for fixproto
-	-rm -rf fix-header xsys-protos.h deduced.h tmp-deduced.h \
+	-rm -rf fix-header$(build_exeext) xsys-protos.h deduced.h tmp-deduced.h \
 	  gen-protos$(build_exeext) fixproto.list fixtmp.* fixhdr.ready
 # Delete files generated for fixincl
 	-rm -rf fixincl fixinc.sh specs.ready
diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index 6557595..40406da 100644
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -22,6 +22,8 @@
 # The makefile built from this file lives in the fixinc subdirectory.
 # Its purpose is to build the any-platforms fixinc.sh script.
 
+SHELL=/bin/sh
+
 FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
 FIXINC_DEFS = -DIN_GCC -DHAVE_CONFIG_H $(FL_LIST) $(INCLUDES)
 
diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index 5f1e363..1f8b220 100644
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -917,7 +917,7 @@ fix_with_system (p_fixd, pz_fix_file, pz_file_source, pz_temp_file)
       /*
        *  Now add the fix number and file names that may be needed
        */
-      sprintf (pz_scan, "%ld %s %s %s", p_fixd - fixDescList,
+      sprintf (pz_scan, "%ld \'%s\' \'%s\' \'%s\'", p_fixd - fixDescList,
 	       pz_fix_file, pz_file_source, pz_temp_file);
     }
   else /* NOT an "internal" fix: */
@@ -936,7 +936,7 @@ fix_with_system (p_fixd, pz_fix_file, pz_file_source, pz_temp_file)
          the following bizarre use of 'cat' only works on DOS boxes.
          It causes the file to be dropped into a temporary file for
          'cat' to read (pipes do not work on DOS).  */
-      tSCC   z_cmd_fmt[] = " %s | cat > %s";
+      tSCC   z_cmd_fmt[] = " \'%s\' | cat > \'%s\'";
 #else
       /* Don't use positional formatting arguments because some lame-o
          implementations cannot cope  :-(.  */