Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put do-make-tools before creating distrib-dirs (as binstall has to be 

available before making distrib-dirs).
This commit is contained in:
tv 2001-09-22 12:30:13 +00:00
parent 9998046745
commit 284306ffbc
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.130 2001/09/22 05:37:17 tv Exp $ # $NetBSD: Makefile,v 1.131 2001/09/22 12:30:13 tv Exp $
# This is the top-level makefile for building NetBSD. For an outline of # 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 # how to build a snapshot or release, as well as other release engineering
@ -43,11 +43,11 @@
# #
# Sub targets of `make build,' in order: # Sub targets of `make build,' in order:
# buildstartmsg: displays the start time of the build. # buildstartmsg: displays the start time of the build.
# beforeinstall: creates the distribution directories. # do-make-tools: builds host toolchain.
# do-distrib-dirs: creates the distribution directories.
# do-force-domestic: check's that FORCE_DOMESTIC isn't set (deprecated.) # do-force-domestic: check's that FORCE_DOMESTIC isn't set (deprecated.)
# do-cleandir: cleans the tree. # do-cleandir: cleans the tree.
# do-make-obj: creates object directories if required. # do-make-obj: creates object directories if required.
# do-make-tools: builds host toolchain.
# do-make-includes: install include files. # do-make-includes: install include files.
# do-lib-csu: build & install startup object files. # do-lib-csu: build & install startup object files.
# do-lib: build & install system libraries. # do-lib: build & install system libraries.
@ -103,15 +103,6 @@ buildendmsg:
@echo -n "Build finished at: " @echo -n "Build finished at: "
@date @date
beforeinstall:
.ifndef NODISTRIBDIRS
.ifndef DESTDIR
(cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=/ distrib-dirs)
.else
(cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=${DESTDIR} distrib-dirs)
.endif
.endif
afterinstall: afterinstall:
.if ${MKMAN} != "no" && !defined(_BUILD) .if ${MKMAN} != "no" && !defined(_BUILD)
${MAKE} ${_M} whatis.db ${MAKE} ${_M} whatis.db
@ -129,11 +120,11 @@ build:
.else .else
build: build:
@${MAKE} ${_M} buildstartmsg @${MAKE} ${_M} buildstartmsg
@${MAKE} ${_M} beforeinstall @${MAKE} ${_M} do-make-tools
@${MAKE} ${_M} do-distrib-dirs
@${MAKE} ${_M} do-force-domestic @${MAKE} ${_M} do-force-domestic
@${MAKE} ${_M} do-cleandir @${MAKE} ${_M} do-cleandir
@${MAKE} ${_M} do-make-obj @${MAKE} ${_M} do-make-obj
@${MAKE} ${_M} do-make-tools
@${MAKE} ${_M} do-make-includes @${MAKE} ${_M} do-make-includes
@${MAKE} ${_M} do-lib-csu @${MAKE} ${_M} do-lib-csu
@${MAKE} ${_M} do-lib @${MAKE} ${_M} do-lib
@ -144,6 +135,21 @@ build:
@${MAKE} ${_M} buildendmsg @${MAKE} ${_M} buildendmsg
.endif .endif
do-make-tools:
.if ${MKOBJDIRS} != "no"
cd ${.CURDIR}/tools && ${MAKE} ${_M} obj
.endif
cd ${.CURDIR}/tools && ${MAKE} ${_M} build
do-distrib-dirs:
.ifndef NODISTRIBDIRS
.ifndef DESTDIR
(cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=/ distrib-dirs)
.else
(cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=${DESTDIR} distrib-dirs)
.endif
.endif
do-force-domestic: do-force-domestic:
.if defined(FORCE_DOMESTIC) .if defined(FORCE_DOMESTIC)
@echo '*** CAPUTE!' @echo '*** CAPUTE!'
@ -160,12 +166,8 @@ do-cleandir:
do-make-obj: do-make-obj:
.if ${MKOBJDIRS} != "no" .if ${MKOBJDIRS} != "no"
${MAKE} ${_J} ${_M} obj ${MAKE} ${_J} ${_M} obj
cd ${.CURDIR}/tools && ${MAKE} ${_M} obj
.endif .endif
do-make-tools:
cd ${.CURDIR}/tools && ${MAKE} ${_M} build
do-make-includes: do-make-includes:
.if !defined(NOINCLUDES) .if !defined(NOINCLUDES)
${MAKE} ${_M} includes ${MAKE} ${_M} includes