diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
| commit | cc3f4b99653c34ae64f8a1fddea370abefef680e (patch) | |
| tree | 8ce0ddd0e6f508bd20c77429c448969589170fae /usr.bin/bmake | |
| parent | f974b33f6ed6f35170c520d2be111bfc2c3954cd (diff) | |
| parent | 16aa1f0950a3b4407a36ecc96acc8ca0710ebd91 (diff) | |
| download | src-cc3f4b99653c34ae64f8a1fddea370abefef680e.tar.gz src-cc3f4b99653c34ae64f8a1fddea370abefef680e.zip | |
Merge from head
Notes
Notes:
svn path=/projects/bmake/; revision=265720
Diffstat (limited to 'usr.bin/bmake')
| -rw-r--r-- | usr.bin/bmake/Makefile.inc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 75678878da8c..25f9a3a96b88 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -1,21 +1,13 @@ # $FreeBSD$ -.include "bsd.own.mk" +.sinclude <src.opts.mk> .if defined(.PARSEDIR) # make sure this is available to unit-tests/Makefile .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 .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= YES |