From: Bruce Korb Date: Wed, 11 Aug 1999 07:17:01 +0000 (+0000) Subject: inclhack.tpl: Only install assert.h conditionally. X-Git-Tag: prereleases/libstdc++-2.92~11221 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7aed7b7099bd6dca92b5f0e43255b525b2ca5355;p=thirdparty%2Fgcc.git 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 d502faa9a5a7..b76a3d667e98 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +1999-08-11 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 fd357a33f2f1..9e9064e579e2 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 7652d171ed31..292c96791068 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 44f379818649..587a8e531438 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 # =][=