From df00a0360ed634232d3e55f83a1a8a577a8fb2fd Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@FreeBSD.org>
Date: Mon, 21 Dec 1998 09:41:26 +0000
Subject: [PATCH]     Elf (and a.out?) rebuild of bootstrap tools appeared to
 be broken due to     some tools requiring header files, such as errno.h, that
 are softlinks.     The mini installation of include files in Makefile.inc1
 wasn't doing     the job, so it has been ripped out and replaced with a true
 make of the     /usr/src/include/ directory (make all and make
 beforeinstall).  I think     the original idea was to save time by not
 installing unnecessary header     files, but it doesn't really save all that
 much time.

    Also, I have moved a NOCLEAN conditional to cover rebuilding the object
    tree 'Rebuilding the ${OBJFORMAT} obj tree' section.  This may or may not
    be correct but it appears to function properly.  If it is not correct we
    need to find another way to avoid scanning every single file in the
    entire source hierarchy for make restarts.
---
 Makefile.inc1 | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8f7a821511fa..21c670db77d0 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.47 1998/12/13 04:32:13 dillon Exp $
+#	$Id: Makefile.inc1,v 1.48 1998/12/13 04:39:01 dillon Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -270,12 +270,12 @@ buildworld: check-objformat
 	@echo ">>> Cleaning up the ${OBJFORMAT} obj tree"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/}
-.endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Rebuilding the ${OBJFORMAT} obj tree"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 par-${OBJDIR}
+.endif
 .if !defined(NOTOOLS)
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -475,18 +475,8 @@ bootstrap:
 .if defined(DESTDIR)
 	rm -f ${DESTDIR}/usr/src/sys
 	ln -s ${.CURDIR}/sys ${DESTDIR}/usr/src
-	cd ${.CURDIR}/include; find -dx . | cpio -dump ${DESTDIR}/usr/include
-.for d in net netatm netinet posix4 sys vm machine
-	if [ -h ${DESTDIR}/usr/include/$d ]; then \
-		rm -f ${DESTDIR}/usr/include/$d ; \
-	fi
-.endfor
-	cd ${.CURDIR}/sys; \
-		find -dx net netatm netinet posix4 sys vm -name '*.h' -o -type d | \
-		cpio -dump ${DESTDIR}/usr/include
-	mkdir -p ${DESTDIR}/usr/include/machine
-	cd ${.CURDIR}/sys/${MACHINE_ARCH}/include; find -dx . -name '*.h' -o -type d | \
-		cpio -dump ${DESTDIR}/usr/include/machine
+	cd ${.CURDIR}/include;	${MAKE} all
+	cd ${.CURDIR}/include;	${MAKE} beforeinstall
 .endif
 	cd ${.CURDIR}/usr.bin/make; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \
 		${MAKE} ${MK_FLAGS} all; \