fixinc.sco: Paramaterize #include_next values.

	* fixinc.sco: Paramaterize #include_next values.
	* fixinc/fixinc.sco: Likewise.

From-SVN: r23479

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fe6c9a35f77e41395857d010a2cdf3b1dca1e3b5..ec27b5ae9fc0cd122baaf14b10ca9aecc587b853 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 31 22:35:29 1998  Jean-Pierre Radley <jpr@jpr.com>
+
+       * fixinc.sco: Paramaterize #include_next values.
+       * fixinc/fixinc.sco: Likewise.
+
 Sat Oct 31 20:39:35 1998  Jeffrey A Law  (law@cygnus.com)
 
        * toplev.c (rest_of_compilation): No longer set reload_completed.

diff --git a/gcc/fixinc.sco b/gcc/fixinc.sco
index 205a8822af1d60f4f85feffb22488d29cf8316ff..5caaf7fc385404ba60aa5e87e464919af8ceba18 100755 (executable)
--- a/gcc/fixinc.sco
+++ b/gcc/fixinc.sco
@@ -381,12 +381,12 @@ do
     then
       echo Fixed $file
       rm -f $LIB/$file
-      cat <<'__EOF__' >$LIB/$file
+      cat << __EOF__ >$LIB/$file
 #ifndef _CURSES_H_WRAPPER
 #ifdef __cplusplus
 # define bool __curses_bool_t
 #endif
-#include_next <curses.h>
+#include_next <$file>
 #ifdef __cplusplus
 # undef bool
 #endif
@@ -396,7 +396,7 @@ __EOF__
       # Define _CURSES_H_WRAPPER at the end of the wrapper, not the start,
       # so that if #include_next gets another instance of the wrapper,
       # this will follow the #include_next chain until we arrive at
-      # the real <curses.h>.
+      # the real system include file.
       chmod a+r $LIB/$file
     fi
   fi

diff --git a/gcc/fixinc/fixinc.sco b/gcc/fixinc/fixinc.sco
index 205a8822af1d60f4f85feffb22488d29cf8316ff..5a1ca9f9ee1410d4bed1129d7469904d73f39049 100755 (executable)
--- a/gcc/fixinc/fixinc.sco
+++ b/gcc/fixinc/fixinc.sco
@@ -381,12 +381,12 @@ do
     then
       echo Fixed $file
       rm -f $LIB/$file
-      cat <<'__EOF__' >$LIB/$file
+      cat <<__EOF__ >$LIB/$file
 #ifndef _CURSES_H_WRAPPER
 #ifdef __cplusplus
 # define bool __curses_bool_t
 #endif
-#include_next <curses.h>
+#include_next <$file>
 #ifdef __cplusplus
 # undef bool
 #endif