From 5c2a59b8b0fd5eee1b74440535f223bfda3cfd55 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Wed, 11 Aug 1999 07:18:16 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/fixinc/fixincl.sh | 12 +++++++----- gcc/fixinc/inclhack.sh | 12 +++++++----- gcc/fixinc/inclhack.tpl | 12 +++++++----- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5fea0fed3b1..f2fc1aae418 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +1999-08-01 Bruce Korb + + * 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 * invoke.texi: s/GNU CC/GCC/ for consistency with gcc.texi. diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh index 73bb35e17b4..56eebd60bc4 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 6be26e98b8d..3445ce67119 100755 --- 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 44f37981864..587a8e53143 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 # =][=