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 retrieving revision 1.194 retrieving revision 1.195 diff -u -p -r1.194 -r1.195 --- src/Makefile 2002/12/26 12:01:48 1.194 +++ src/Makefile 2003/01/02 23:15:27 1.195 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.194 2002/12/26 12:01:48 lukem Exp $ +# $NetBSD: Makefile,v 1.195 2003/01/02 23:15:27 atatat Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -311,9 +311,31 @@ install-${dir}: dependall-distrib depend-distrib all-distrib: @true +# +# we don't want the obj target in etc invoked as part of the normal +# course of events because that makes it too early. therefore, define +# a neutral version of the target that bsd.subdir.mk would create. +# +obj-etc: + @true + .include .include +# +# now, make a "real" target that will recurse into etc to enact the +# obj target, and .USE it onto the end of the obj handling for the +# current directory. note that this is only done if we already have +# commands for the obj target (we won't if we're not making objdirs), +# and only if etc is a target subdirectory. +# +.if commands(obj) && (${SUBDIR:Metc} == "etc") +real-obj-etc: .USE + @(echo "obj ===> etc"; \ + cd ${.CURDIR}/etc && ${MAKE} obj) +obj: real-obj-etc +.endif + build-docs: ${.CURDIR}/BUILDING ${.CURDIR}/BUILDING: doc/BUILDING.mdoc groff -mdoc -Tascii -P-b -P-u -P-o $> >$@