aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rwxr-xr-xgcc/fixinc.sco6
-rwxr-xr-xgcc/fixinc/fixinc.sco4
3 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fe6c9a3..ec27b5a 100644
--- 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 205a882..5caaf7f 100755
--- 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 205a882..5a1ca9f 100755
--- 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