From: Daniel Jacobowitz <dan@codesourcery.com>
Date: Wed, 22 Feb 2006 20:21:14 +0000 (+0000)
Subject: Makefile.in (stmp-fixinc): Use real-$(INSTALL_HEADERS_DIR).
X-Git-Tag: releases/gcc-4.2.0~4001
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=9fb03bd8d79ea68d981c00c94bdb0ba5fb04b9ff;p=gcc.git

Makefile.in (stmp-fixinc): Use real-$(INSTALL_HEADERS_DIR).

	* Makefile.in (stmp-fixinc): Use real-$(INSTALL_HEADERS_DIR).
	(real-install-headers-tar, real-install-headers-cpio)
	(real-install-headers-cp): New targets.

From-SVN: r111372
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 39d9c78b5ceb..8470fa8ecd73 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.in (stmp-fixinc): Use real-$(INSTALL_HEADERS_DIR).
+	(real-install-headers-tar, real-install-headers-cpio)
+	(real-install-headers-cp): New targets.
+
 2006-02-22  Richard Sandiford  <richard@codesourcery.com>
 
 	* tree.h (variable_section): Delete.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 002b1c941518..59fdd4f0fc52 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3195,7 +3195,7 @@ stmp-fixinc: gsyslimits.h macro_list \
 	-chmod a+rx include
 	if [ -d ../prev-gcc ]; then \
 	  cd ../prev-gcc && \
-	  $(MAKE) $(INSTALL_HEADERS_DIR) DESTDIR=`pwd`/../gcc/ \
+	  $(MAKE) real-$(INSTALL_HEADERS_DIR) DESTDIR=`pwd`/../gcc/ \
 	    libsubdir=. ; \
 	else \
 	  (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
@@ -3789,6 +3789,18 @@ install-headers-cpio: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
 install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
 	cp -p -r include $(DESTDIR)$(libsubdir)
 
+# Targets without dependencies, for use in prev-gcc during bootstrap.
+real-install-headers-tar:
+	(cd `${PWD_COMMAND}`/include ; \
+	 tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
+
+real-install-headers-cpio:
+	cd `${PWD_COMMAND}`/include ; \
+	find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
+
+real-install-headers-cp:
+	cp -p -r include $(DESTDIR)$(libsubdir)
+
 # Install supporting files for fixincludes to be run later.
 install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-itoolsdirs \
   macro_list xlimits.h