Makefile.in (stmp-fixinc): Do not install assert.h if not desired.

        * Makefile.in (stmp-fixinc): Do not install assert.h if not desired.
        * config/t-rtems: Do not install assert.h -- use newlib's.

From-SVN: r23098

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0051f906e85e63b961aba2cfd48b979622c2e372..567289eff5ac0ad5a53beccfb28232bf3d775ca5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 14 22:13:28 1998  Joel Sherrill (joel@OARcorp.com)
+
+       * Makefile.in (stmp-fixinc): Do not install assert.h if not desired.
+       * config/t-rtems: Do not install assert.h -- use newlib's.
+
 Sat Oct  3 19:01:03 1998  Richard Henderson  <rth@cygnus.com>
 
        * alpha/linux.h (CPP_PREDEFINES): Define __alpha__ for imake.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 89894eb658a86a42341d5625802015a3ebb5da2c..5acf9267aef736fc3639bb73d7a86bac83d9b3d9 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2004,9 +2004,12 @@ stmp-fixinc: $(FIXINCLUDES) gsyslimits.h
              $(SHELL) $(srcdir)/$(FIXINCLUDES) include $$dir; \
            else true; fi; \
          done; \
-         rm -f include/assert.h; \
-         cp $(srcdir)/assert.h include/assert.h; \
-         chmod a+r include/assert.h; \
+         if [ x$(INSTALL_ASSERT_H) != x ] ; \
+         then \
+           rm -f include/assert.h; \
+           cp $(srcdir)/assert.h include/assert.h; \
+           chmod a+r include/assert.h; \
+         fi \
        else true; \
        fi
        rm -f include/syslimits.h

diff --git a/gcc/config/t-rtems b/gcc/config/t-rtems
index 25dd398dd52e0cab03b380909a7b8f87f9d34998..aa0ca66d98b8d6bd8fc9e4ecf20c182d6e92a911 100644 (file)
--- a/gcc/config/t-rtems
+++ b/gcc/config/t-rtems
@@ -1,2 +1,6 @@
 # RTEMS uses newlib which does not require prototype fixing
 STMP_FIXPROTO =
+
+# Don't install "assert.h" in gcc.  RTEMS uses the one in newlib.
+INSTALL_ASSERT_H =
+