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: r28659

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d502faa9a5a72e0a37b9858300d7ee521ac58229..b76a3d667e980a45aec96aede2bd463e970d6570 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+1999-08-11  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 fd357a33f2f1e2a438daaf4a114d4bdbdf544616..9e9064e579e2a46997b1847f68fdb1564076619c 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 7652d171ed31b425902936f61b3209958cdf7379..292c96791068d0d706cee1de3ab5083ab2d4e42e 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -3224,8 +3224,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
 # =][=