Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.232
retrieving revision 1.241
diff -u -p -r1.232 -r1.241
--- src/Makefile	2004/04/13 12:43:12	1.232
+++ src/Makefile	2006/01/04 15:30:02	1.241
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.232 2004/04/13 12:43:12 lukem Exp $
+#	$NetBSD: Makefile,v 1.241 2006/01/04 15:30:02 apb Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -50,7 +50,7 @@
 #	defaults to the root directory).  Ensures that INSTALLWORLDDIR
 #	is the not root directory if cross compiling.
 #   release:
-#	Does a `make build', and then tars up the DESTDIR files
+#	Does a `make distribution', and then tars up the DESTDIR files
 #	into RELEASEDIR/${MACHINE}, in release(7) format.
 #	(See etc/Makefile for more information on this.)
 #   regression-tests:
@@ -59,6 +59,8 @@
 #	Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR}
 #   sourcesets:
 #	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
+#   syspkgs:
+#	Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}
 #
 # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.
@@ -68,10 +70,11 @@
 #   includes:        installs include files.
 #   do-tools-compat: builds the "libnbcompat" library; needed for some
 #                    random host tool programs in the source tree.
-#   do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.
+#   do-gnu-lib-crtstuff3: builds and installs prerequisites from
+#			  gnu/lib/crtstuff3
+#   do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3
 #   do-lib-libc:     builds and installs prerequisites from lib/libc.
-#   do-lib-libdes:   builds and installs prerequisites from lib/libdes.
 #   do-lib:          builds and installs prerequisites from lib.
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
 #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.
@@ -143,19 +146,21 @@ afterinstall: .PHONY
 	${MAKEDIRTARGET} . postinstall-check
 .endif
 
+_POSTINSTALL=	${.CURDIR}/usr.sbin/postinstall/postinstall
+
 postinstall-check: .PHONY
 	@echo "   === Post installation checks ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
+	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check
 	@echo "   ================================"
 
 postinstall-fix: .NOTMAIN .PHONY
 	@echo "   === Post installation fixes ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
+	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
 	@echo "   ==============================="
 
 postinstall-fix-obsolete: .NOTMAIN .PHONY
 	@echo "   === Removing obsolete files ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
+	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
 	@echo "   ==============================="
 
 
@@ -187,12 +192,12 @@ BUILDTARGETS+=	includes
 BUILDTARGETS+=	do-tools-compat
 BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
+.if ${HAVE_GCC3} != "no"
+BUILDTARGETS+=	do-gnu-lib-crtstuff${LIBGCC_EXT}
+.endif
 BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}
 .endif
 BUILDTARGETS+=	do-lib-libc
-.if ${MKCRYPTO} != "no"
-BUILDTARGETS+=	do-lib-libdes
-.endif
 BUILDTARGETS+=	do-lib do-gnu-lib
 BUILDTARGETS+=	do-ld.so
 BUILDTARGETS+=	do-build
@@ -283,20 +288,20 @@ installworld: .PHONY
 # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
 #
 
-.for tgt in sets sourcesets
+.for tgt in sets sourcesets syspkgs
 ${tgt}: .PHONY
 	${MAKEDIRTARGET} distrib/sets ${tgt}
 .endfor
 
 #
-# Build a release or snapshot (implies "make build").  Note that
+# Build a release or snapshot (implies "make distribution").  Note that
 # in this case, the set lists will be checked before the tar files
 # are made.
 #
 
 release snapshot: .PHONY
-	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
-	${MAKEDIRTARGET} etc release INSTALL_DONE=1
+	${MAKEDIRTARGET} . distribution
+	${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
@@ -327,7 +332,7 @@ do-${targ}: .PHONY ${targ}
 	@true
 .endfor
 
-.for dir in tools tools/compat lib/csu gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib
+.for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib
 do-${dir:S/\//-/g}: .PHONY
 .for targ in dependall install
 	${MAKEDIRTARGET} ${dir} ${targ}