inclhack.tpl: Only install assert.h conditionally.

        * fixinc/inclhack.tpl: Only install assert.h conditionally.
        * fixinc/inclhack.sh: Regenerated.
        * fixinc/fixincl.sh: Regenerated.

From-SVN: r28660

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5fea0fed3b1d8502b26e76f8c1f20f85d1bcf426..f2fc1aae41812f822d3e2174ce395e7c6738c1c0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+1999-08-01  Bruce Korb  <ddsinc09@ix.netcom.com>
+
+       * fixinc/inclhack.tpl: Only install assert.h conditionally.
+       * fixinc/inclhack.sh: Regenerated.
+       * fixinc/fixincl.sh: Regenerated.
+
 Wed Aug 11 00:34:22 1999  Joe Buck  <jbuck@synopsys.com>
 
        * invoke.texi: s/GNU CC/GCC/ for consistency with gcc.texi.

diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index 73bb35e17b4abe0c5fb626f011dba2cc6b494bd0..56eebd60bc4c40b14eed93c85422c99604de09b3 100755 (executable)
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -406,8 +406,10 @@ done
 #
 # # # # # # # # # # # # # # # # # # # # #
 
-cd $ORIGDIR
-rm -f include/assert.h
-cp ${srcdir}/assert.h include/assert.h || exit 1
-chmod a+r include/assert.h
-
+if [ x${INSTALL_ASSERT_H} != x ] && [ -f ${srcdir}/assert.h ]
+then
+  cd $ORIGDIR
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
+fi

diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 6be26e98b8d4f221926f2d099f483b09ffc1c5c5..3445ce6711936638736f44ff52f2affb8f4094df 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -3093,8 +3093,10 @@ done
 #
 # # # # # # # # # # # # # # # # # # # # #
 
-cd $ORIGDIR
-rm -f include/assert.h
-cp ${srcdir}/assert.h include/assert.h || exit 1
-chmod a+r include/assert.h
-
+if [ x${INSTALL_ASSERT_H} != x ] && [ -f ${srcdir}/assert.h ]
+then
+  cd $ORIGDIR
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
+fi

diff --git a/gcc/fixinc/inclhack.tpl b/gcc/fixinc/inclhack.tpl
index 44f379818649ef6c6de6008e3dd1d88ce13c4d0f..587a8e531438e1e33365999b73de5b23550348fb 100644 (file)
--- a/gcc/fixinc/inclhack.tpl
+++ b/gcc/fixinc/inclhack.tpl
@@ -416,11 +416,13 @@ done
 #
 # # # # # # # # # # # # # # # # # # # # #
 
-cd $ORIGDIR
-rm -f include/assert.h
-cp ${srcdir}/assert.h include/assert.h || exit 1
-chmod a+r include/assert.h
-[=
+if [ x${INSTALL_ASSERT_H} != x ] && [ -f ${srcdir}/assert.h ]
+then
+  cd $ORIGDIR
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
+fi[=
 
 #  Make the output file executable
 # =][=