aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Stallman <rms@gnu.org>1992-10-06 20:39:15 +0000
committerRichard Stallman <rms@gnu.org>1992-10-06 20:39:15 +0000
commit6204c24f34166b48c213cc1e5d1ba853f48142e0 (patch)
treec72968534c62c79b5d7699c6c1a01ffc7a9f7ac0
parentd60280fd678f2ce1711193d66f7e543ba5c3dd68 (diff)
downloadgcc-6204c24f34166b48c213cc1e5d1ba853f48142e0.zip
gcc-6204c24f34166b48c213cc1e5d1ba853f48142e0.tar.gz
gcc-6204c24f34166b48c213cc1e5d1ba853f48142e0.tar.bz2
(install-common-headers): Use $(assertdir).
(assertdir): New variable. From-SVN: r2344
-rw-r--r--gcc/Makefile.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index d4c8e6e..12cf789 100644
--- 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