summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-06-06 00:56:23 +0000
committerbde <bde@FreeBSD.org>1998-06-06 00:56:23 +0000
commit55772ed9c6adb7c30179f4ca7a75cd6b5d6a6bc0 (patch)
tree02fd49eee00c33d78ef576adc9226a6a86734e30 /Makefile
parent54743b71f3cc99d4a9c8598ba79fa8fb45d20d7c (diff)
downloadFreeBSD-src-55772ed9c6adb7c30179f4ca7a75cd6b5d6a6bc0.zip
FreeBSD-src-55772ed9c6adb7c30179f4ca7a75cd6b5d6a6bc0.tar.gz
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 92022d9..18d7b35 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
OpenPOWER on IntegriCloud