(install-common-headers): Install assert.h separately, in includedir,

but not if file exists and lacks the magic comment.

From-SVN: r2309

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6ad8ddfd66964b4d559f8ff4b3781011202db979..43d04f0e143cf8deaab65abae5f0d069a7d6135f 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1486,9 +1486,13 @@ install-common-headers: install-dir $(USER_H) gvarargs.h gstdarg.h gstddef.h
           $(INSTALL_DATA) `basename $$file` $$shelllibsubdir/include/`basename $$file`; \
           chmod a-x $$shelllibsubdir/include/`basename $$file`; \
        done
-       -rm -f $(includedir)/assert.h
-       $(INSTALL_DATA) $(srcdir)/assert.h $(includedir)/assert.h
-       chmod a-x $(libsubdir)/include/assert.h
+       if [ -f $(includedir)/assert.h ] && ! grep "This is GCC's version of assert.h." $(includedir)/assert.h; \
+       then true; \
+       else \
+         rm -f $(includedir)/assert.h; \
+         $(INSTALL_DATA) $(srcdir)/assert.h $(includedir)/assert.h; \
+         chmod a-x $(libsubdir)/include/assert.h; \
+       fi
        -rm -f $(libsubdir)/include/varargs.h
        $(INSTALL_DATA) $(srcdir)/gvarargs.h $(libsubdir)/include/varargs.h
        chmod a-x $(libsubdir)/include/varargs.h