From 9e3b9b4d1c109a9470d285e4eb55b34e7aa54e89 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sat, 6 Jun 1998 00:56:23 +0000 Subject: [PATCH] Fixed bogotification of the lex bootstrap in rev.1.186 and the previous commit - don't wander off to bootstrap mtree and include in the middle of bootstrapping lex, and don't forget what we were doing and build some lex obj dirs twice. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 92022d9aec4c..18d7b35a3bbb 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.195 1998/06/04 12:02:52 jb Exp $ +# $Id: Makefile,v 1.196 1998/06/05 16:50:45 jkh Exp $ # # While porting to the another architecture include the bootstrap instead # of the normal build. @@ -493,16 +493,16 @@ bootstrap: cd ${.CURDIR}/usr.bin/lex; ${MAKE} bootstrap; \ ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ ${MAKE} ${MK_FLAGS} -DNOLIB all; \ - ${MAKE} ${MK_FLAGS} -DNOLIB -B install ${CLEANDIR} ${OBJDIR} + ${MAKE} ${MK_FLAGS} -DNOLIB -B install ${CLEANDIR} +.if !defined(NOOBJDIR) + cd ${.CURDIR}/usr.bin/lex; ${MAKE} ${OBJDIR} +.endif cd ${.CURDIR}/usr.sbin/mtree; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ ${MAKE} ${MK_FLAGS} all; \ ${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR} .if defined(DESTDIR) cd ${.CURDIR}/include && ${MAKE} copies .endif -.if !defined(NOOBJDIR) - cd ${.CURDIR}/usr.bin/lex; ${MAKE} ${OBJDIR} -.endif # # include-tools - generally the same as 'bootstrap', except that it's for