(install-common-headers): Use $(assertdir).

(assertdir): New variable.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@2344 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index d4c8e6e..12cf789 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -143,6 +143,8 @@ libdir = $(exec_prefix)/lib
 libsubdir = $(libdir)/gcc-lib/$(target)/$(version)
 # Directory for header file assert.h.
 includedir = $(prefix)/include
+# assertdir is overridden in cross-make.
+assertdir = $(includedir)
 # Extension (if any) to put in installed man-page filename.
 manext = .1
 # Directory in which to put man pages.
@@ -1489,12 +1491,12 @@ install-common-headers: install-dir $(USER_H) gvarargs.h gstdarg.h gstddef.h
        done
 # Put assert.h in /usr/local/include, so it won't override GNU libc's assert.h.
 # Don't replace the assert.h already there if it is not from GCC.
-       if [ -f $(includedir)/assert.h ] && ! grep "__eprintf" $(includedir)/assert.h; \
+       if [ -f $(assertdir)/assert.h ] && ! grep "__eprintf" $(assertdir)/assert.h; \
        then true; \
        else \
-         rm -f $(includedir)/assert.h; \
-         $(INSTALL_DATA) $(srcdir)/assert.h $(includedir)/assert.h; \
-         chmod a-x $(includedir)/include/assert.h; \
+         rm -f $(assertdir)/assert.h; \
+         $(INSTALL_DATA) $(srcdir)/assert.h $(assertdir)/assert.h; \
+         chmod a-x $(assertdir)/include/assert.h; \
        fi
        -rm -f $(libsubdir)/include/varargs.h
        $(INSTALL_DATA) $(srcdir)/gvarargs.h $(libsubdir)/include/varargs.h