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.99.4.1 retrieving revision 1.100 diff -u -p -r1.99.4.1 -r1.100 --- src/Makefile 1999/12/27 18:26:56 1.99.4.1 +++ src/Makefile 1999/11/30 16:16:41 1.100 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99.4.1 1999/12/27 18:26:56 wrstuden Exp $ +# $NetBSD: Makefile,v 1.100 1999/11/30 16:16:41 sommerfeld 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 @@ -15,18 +15,16 @@ # (lowest priority). # # Variables: -# DESTDIR is the target directory for installation of the compiled -# software. It defaults to /. Note that programs are built against -# libraries installed in DESTDIR. +# NBUILDJOBS is the number of jobs to start in parallel during a +# 'make build'. It defaults to 1. # MKMAN, if set to `no', will prevent building of manual pages. -# MKOBJDIRS, if not set to `no', will build object directories at -# an appropriate point in a build. # MKSHARE, if set to `no', will prevent building and installing # anything in /usr/share. -# NBUILDJOBS is the number of jobs to start in parallel during a -# 'make build'. It defaults to 1. # UPDATE will avoid a `make cleandir' at the start of `make build', # as well as having the effects listed in /usr/share/mk/bsd.README. +# DESTDIR is the target directory for installation of the compiled +# software. It defaults to /. Note that programs are built against +# libraries installed in DESTDIR. # # Targets: # build: builds a full release of netbsd in DESTDIR. @@ -97,13 +95,13 @@ build: beforeinstall .endif .if ${MKSHARE} != "no" (cd ${.CURDIR}/share/mk && ${MAKE} install) + (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install) .endif .if !defined(UPDATE) ${MAKE} cleandir .endif .if ${MKOBJDIRS} != "no" ${MAKE} obj - (cd ${.CURDIR}/distrib && ${MAKE} obj) .endif .if empty(HAVE_GCC28) .if defined(DESTDIR) @@ -127,9 +125,6 @@ build: beforeinstall (cd ${.CURDIR}/gnu/lib && \ ${MAKE} ${_J} dependall MKMAN=no MKINFO=no && \ ${MAKE} MKMAN=no MKINFO=no install) -.if ${MKSHARE} != "no" - (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install) -.endif ${MAKE} ${_J} dependall && ${MAKE} _BUILD= install .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM) (cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_J} _SLAVE_BUILD= build)