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.156 retrieving revision 1.162 diff -u -p -r1.156 -r1.162 --- src/Makefile 2001/11/15 19:32:19 1.156 +++ src/Makefile 2002/02/14 19:17:32 1.162 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.156 2001/11/15 19:32:19 tv Exp $ +# $NetBSD: Makefile,v 1.162 2002/02/14 19:17:32 tv Exp $ # This is the top-level makefile for building NetBSD. For an outline of # how to build a snapshot or release, as well as other release engineering @@ -74,7 +74,12 @@ .endif .if defined(NBUILDJOBS) -_J= -j${NBUILDJOBS} +.if !target(.BEGIN) +.BEGIN: + @echo 'NBUILDJOBS is currently broken; see PR toolchain/14837.' + @false +.endif +#_J= -j${NBUILDJOBS} .endif _SUBDIR= tools lib include gnu bin games libexec sbin usr.bin \ @@ -94,12 +99,21 @@ regression-tests: @(cd ${.CURDIR}/regress && ${MAKE} regress) .endif -.if ${MKMAN} != "no" -afterinstall: whatis.db whatis.db: +.if ${MKMAN} != "no" (cd ${.CURDIR}/share/man && ${MAKE} makedb) .endif +# XXX I wish there was a more rational place to do this, but I can't +# think of one. There is no one place the info/dir file gets generated. +infodir-meta: +.if defined(UNPRIVED) && (${MKINFO} != "no") + echo "${DESTDIR}/usr/share/info/dir type=file mode=0644 uname=root gname=wheel" | \ + sed -e 's|^/|./|g' -e 's|//|/|g' >>${METALOG} +.endif + +afterinstall: whatis.db infodir-meta + # Targets (in order!) called by "make build". BUILDTARGETS+= check-tools @@ -139,6 +153,12 @@ build: @echo -n "Build finished at: " && date .endif +# Build a full distribution, but not a release (i.e. no sets into +# ${RELEASEDIR}). + +distribution: build + (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution) + # Build a release or snapshot (implies "make build"). release snapshot: build @@ -188,6 +208,9 @@ install-${dir}: dependall-distrib depend-distrib all-distrib: @true +clean: + rm -f METALOG + .include .include