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.161 retrieving revision 1.170 diff -u -p -r1.161 -r1.170 --- src/Makefile 2002/02/08 16:11:18 1.161 +++ src/Makefile 2002/04/29 12:09:13 1.170 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.161 2002/02/08 16:11:18 lukem Exp $ +# $NetBSD: Makefile,v 1.170 2002/04/29 12:09:13 lukem 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 @@ -58,6 +58,12 @@ .MAKEFLAGS: -m ${.CURDIR}/share/mk .endif +# If _SRC_TOP_OBJ_ gets set here, we will end up with a directory that may +# not be the top level objdir, because "make obj" can happen in the *middle* +# of "make build" (long after is calculated it). So, pre-set +# _SRC_TOP_OBJ_ here so it will not be added to ${.MAKEOVERRIDES}. +_SRC_TOP_OBJ_= + .include # Sanity check: make sure that "make build" is not invoked simultaneously @@ -74,11 +80,16 @@ .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 \ - usr.sbin share sys etc distrib regress +_SUBDIR= tools lib include gnu bin games libexec sbin usr.bin +_SUBDIR+= usr.sbin share sys etc distrib regress # Weed out directories that don't exist. @@ -94,20 +105,19 @@ regression-tests: @(cd ${.CURDIR}/regress && ${MAKE} regress) .endif -whatis.db: +afterinstall: postinstall-check .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} + (cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta) .endif -afterinstall: whatis.db infodir-meta +postinstall-check: + @echo " === Post installation checks ===" + sh ${.CURDIR}/etc/postinstall -s ${.CURDIR}/etc -d ${DESTDIR}/etc check + @echo " ================================" + # Targets (in order!) called by "make build".