diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-05-17 22:18:27 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-05-17 22:18:27 +0000 |
| commit | 3c1c0edeef8c40b5234ff6717542280dd4792b95 (patch) | |
| tree | c3ce185b02a42150a9584391bac33c65fa580ca8 | |
| parent | b05fbf171e48ff3e005c2bc66e3dd22f263c61f1 (diff) | |
Notes
| -rw-r--r-- | usr.bin/bmake/Makefile.inc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 7b5f54598a090..75678878da8ce 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -1,12 +1,5 @@ # $FreeBSD$ -# we need the up to date bsd.own.mk -.if ${.CURDIR:M*make} == "" -.sinclude "share/mk/bsd.own.mk" -.else -.sinclude "../../share/mk/bsd.own.mk" -.endif -# the above should have found it... .include "bsd.own.mk" .if defined(.PARSEDIR) @@ -14,6 +7,12 @@ .export SRCTOP .endif +# Sadly, we cannot assume bsd.own.mk did its job, +# nor can we safely include the one we want +.if !defined(WITHOUT_BMAKE) +MK_BMAKE= yes +.endif + .if defined(MK_BMAKE) && ${MK_BMAKE} != "no" PROG= make .endif |