diff options
author | Bruce Korb <ddsinc09@ix.netcom.com> | 1999-08-11 07:17:01 +0000 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 1999-08-11 01:17:01 -0600 |
commit | 7aed7b7099bd6dca92b5f0e43255b525b2ca5355 (patch) | |
tree | b3c85567cc8989551567d15605d4750e1ef78829 | |
parent | 0c2d1a2a2323e457e3e076457f95cbc7460b92f7 (diff) | |
download | gcc-7aed7b7099bd6dca92b5f0e43255b525b2ca5355.zip gcc-7aed7b7099bd6dca92b5f0e43255b525b2ca5355.tar.gz gcc-7aed7b7099bd6dca92b5f0e43255b525b2ca5355.tar.bz2 |
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
-rw-r--r-- | gcc/ChangeLog | 6 | ||||
-rwxr-xr-x | gcc/fixinc/fixincl.sh | 12 | ||||
-rwxr-xr-x | gcc/fixinc/inclhack.sh | 12 | ||||
-rw-r--r-- | gcc/fixinc/inclhack.tpl | 12 |
4 files changed, 27 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d502faa..b76a3d6 100644 --- 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 fd357a3..9e9064e 100755 --- 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 7652d17..292c967 100755 --- 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 44f37981..587a8e5 100644 --- 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 # =][= |