From f80df2fa88b118d1d75e49c81d232ada7a655278 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Fri, 10 Dec 1999 16:13:41 +0000 Subject: [PATCH] o Don't make games/fortune/strfile if games does not exist or NOGAMES has been defined. o Make libraries before making depend. --- Makefile.inc1 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cda6ff09a9da..67bfcfe1ccdb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -193,16 +193,16 @@ buildworld: cd ${.CURDIR}; ${XMAKE} includes @echo @echo "--------------------------------------------------------------" - @echo ">>> Rebuilding dependencies" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${XMAKE} par-depend - @echo - @echo "--------------------------------------------------------------" @echo ">>> Building libraries" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${XMAKE} -DNOINFO -DNOMAN libraries @echo @echo "--------------------------------------------------------------" + @echo ">>> Rebuilding dependencies" + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; ${XMAKE} par-depend + @echo + @echo "--------------------------------------------------------------" @echo ">>> Building everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${XMAKE} all @@ -326,8 +326,12 @@ installmost: # # tools - Build tools needed to run the actual build. # +.if exists(${.CURDIR}/games) && !defined(NOGAMES) +_strfile= games/fortune/strfile +.endif + tools:: -.for _tool in games/fortune/strfile gnu/usr.bin/binutils usr.bin/objformat \ +.for _tool in ${_strfile} gnu/usr.bin/binutils usr.bin/objformat \ usr.bin/yacc gnu/usr.bin/bison gnu/usr.bin/cc cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \