--=-=-=

Hoang Tran <hqt@rocketmail.com> writes:
> Looks like the failure is in /usr/src/lib/libasn1. Any suggestions
> on how to fix this?

Does this look like a reasonable way of trying to deal with these
bootstrapping problems?

/assar

--=-=-=
Content-Disposition: attachment; filename=netbsd-includes.diff

Index: Makefile
===================================================================
RCS file: /cvsroot/basesrc/Makefile,v
retrieving revision 1.121
diff -u -w -r1.121 Makefile
--- Makefile	2000/10/07 17:18:17	1.121
+++ Makefile	2000/12/21 07:59:59
@@ -147,7 +147,7 @@
 .endif
 .endif
 .if !defined(NOINCLUDES)
-	${MAKE} ${_M} includes
+	${MAKE} ${_M} includes incinstall
 .endif
 	(cd ${.CURDIR}/lib/csu && \
 	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
Index: share/mk/bsd.doc.mk
===================================================================
RCS file: /cvsroot/sharesrc/share/mk/bsd.doc.mk,v
retrieving revision 1.48
diff -u -w -r1.48 bsd.doc.mk
--- share/mk/bsd.doc.mk	2000/06/06 09:53:29	1.48
+++ share/mk/bsd.doc.mk	2000/12/21 08:00:00
@@ -77,7 +77,7 @@
 spell: ${SRCS}
 	spell ${.ALLSRC} | sort | comm -23 - spell.ok > paper.spell
 
-depend includes lint obj tags:
+depend includes incinstall lint obj tags:
 
 dependall: all
 
Index: share/mk/bsd.inc.mk
===================================================================
RCS file: /cvsroot/sharesrc/share/mk/bsd.inc.mk,v
retrieving revision 1.16
diff -u -w -r1.16 bsd.inc.mk
--- share/mk/bsd.inc.mk	2000/06/06 09:53:29	1.16
+++ share/mk/bsd.inc.mk	2000/12/21 08:00:00
@@ -1,10 +1,10 @@
 #	$NetBSD: bsd.inc.mk,v 1.16 2000/06/06 09:53:29 mycroft Exp $
 
 .PHONY:		incinstall
-includes:	${INCS} incinstall
+includes:	${INCS}
 
 .if defined(INCS)
-incinstall:: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
+incinstall: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .PRECIOUS: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .if !defined(UPDATE)
 .PHONY: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
@@ -21,8 +21,4 @@
 .for I in ${INCS}
 ${DESTDIR}${INCSDIR}/$I: $I __incinstall
 .endfor
-.endif
-
-.if !target(incinstall)
-incinstall::
 .endif
Index: share/mk/bsd.info.mk
===================================================================
RCS file: /cvsroot/sharesrc/share/mk/bsd.info.mk,v
retrieving revision 1.18
diff -u -w -r1.18 bsd.info.mk
--- share/mk/bsd.info.mk	2000/06/10 14:12:04	1.18
+++ share/mk/bsd.info.mk	2000/12/21 08:00:00
@@ -61,4 +61,4 @@
 .endif
 
 # Make sure all of the standard targets are defined, even if they do nothing.
-clean depend includes lint regress tags:
+clean depend includes incinstall lint regress tags:
Index: share/mk/bsd.kinc.mk
===================================================================
RCS file: /cvsroot/sharesrc/share/mk/bsd.kinc.mk,v
retrieving revision 1.17
diff -u -w -r1.17 bsd.kinc.mk
--- share/mk/bsd.kinc.mk	2000/07/07 04:35:35	1.17
+++ share/mk/bsd.kinc.mk	2000/12/21 08:00:00
@@ -49,7 +49,7 @@
 
 
 .PHONY:		incinstall
-includes:	${INCS} incinstall
+includes:	${INCS}
 
 
 .if ${SYS_INCLUDE} == "symlinks"
@@ -64,7 +64,7 @@
 
 # make sure the directory is OK, and install includes.
 
-incinstall:: ${DESTDIR}${INCSDIR}
+incinstall: ${DESTDIR}${INCSDIR}
 .PRECIOUS: ${DESTDIR}${INCSDIR}
 .PHONY: ${DESTDIR}${INCSDIR}
 
@@ -77,7 +77,7 @@
 	fi
 
 .if defined(INCS)
-incinstall:: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
+incinstall: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .PRECIOUS: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .if !defined(UPDATE)
 .PHONY: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
@@ -97,7 +97,7 @@
 .endif
 
 .if defined(DEPINCS)
-incinstall:: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
+incinstall: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .PRECIOUS: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .if !defined(UPDATE)
 .PHONY: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
@@ -118,7 +118,7 @@
 .endif # not symlinks
 
 .if defined(SYMLINKS) && !empty(SYMLINKS)
-incinstall::
+incinstall:
 	@(set ${SYMLINKS}; \
 	 while test $$# -ge 2; do \
 		l=$$1; \
@@ -134,10 +134,6 @@
 		echo "$$t -> $$l"; \
 		rm -rf $$t; ln -s $$l $$t; \
 	 done; )
-.endif
-
-.if !target(incinstall)
-incinstall::
 .endif
 
 .include <bsd.subdir.mk>
Index: share/mk/bsd.man.mk
===================================================================
RCS file: /cvsroot/sharesrc/share/mk/bsd.man.mk,v
retrieving revision 1.57
diff -u -w -r1.57 bsd.man.mk
--- share/mk/bsd.man.mk	2000/09/26 15:33:28	1.57
+++ share/mk/bsd.man.mk	2000/12/21 08:00:00
@@ -198,4 +198,4 @@
 .endif
 
 # Make sure all of the standard targets are defined, even if they do nothing.
-clean depend includes lint regress tags:
+clean depend includes incinstall lint regress tags:
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/sharesrc/share/mk/bsd.own.mk,v
retrieving revision 1.146
diff -u -w -r1.146 bsd.own.mk
--- share/mk/bsd.own.mk	2000/12/07 08:35:15	1.146
+++ share/mk/bsd.own.mk	2000/12/21 08:00:00
@@ -142,9 +142,11 @@
 MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}}
 .endif
 
-TARGETS+=	all clean cleandir depend dependall distclean includes \
+TARGETS+=	all clean cleandir depend dependall distclean incinstall \
+		includes \
 		install lint obj regress tags html installhtml cleanhtml
-.PHONY:		all clean cleandir depend dependall distclean includes \
+.PHONY:		all clean cleandir depend dependall distclean incinstall \
+		includes \
 		install lint obj regress tags beforedepend afterdepend \
 		beforeinstall afterinstall realinstall realdepend realall \
 		html installhtml cheanhtml
Index: gnu/lib/libstdc++/config/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/lib/libstdc++/config/Makefile,v
retrieving revision 1.4
diff -u -w -r1.4 Makefile
--- gnu/lib/libstdc++/config/Makefile	2000/03/26 09:54:28	1.4
+++ gnu/lib/libstdc++/config/Makefile	2000/12/21 08:00:54
@@ -25,4 +25,4 @@
 
 .include <bsd.prog.mk>
 
-incinstall:: linksinstall
+incinstall: linksinstall

--=-=-=--