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

	(real-install-headers-tar, real-install-headers-cpio)
	(real-install-headers-cp): New targets.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 39d9c78..8470fa8 100644 (file)
--- 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.
 2006-02-22  Richard Sandiford  <richard@codesourcery.com>
 
        * tree.h (variable_section): Delete.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 002b1c9..59fdd4f 100644 (file)
--- 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 && \
        -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}`; \
            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)
 
 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
 # Install supporting files for fixincludes to be run later.
 install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-itoolsdirs \
   macro_list xlimits.h