diff options
| author | sjg <sjg@FreeBSD.org> | 2013-05-16 15:28:38 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-05-16 15:28:38 +0000 |
| commit | 50a31d452c540902dc3440b10fdb5be335608fe8 (patch) | |
| tree | afcfd928851de386eed0df43c4bf1be8698f6f14 | |
| parent | 6a6c551958965746577b88c3f2987080a5a97b7f (diff) | |
| download | FreeBSD-src-50a31d452c540902dc3440b10fdb5be335608fe8.zip FreeBSD-src-50a31d452c540902dc3440b10fdb5be335608fe8.tar.gz | |
Build bmake by default.
If someone explicitly builds usr.bin/make while MK_BMAKE==yes,
install it as 'fmake'.
Reviewed by: brooks
| -rw-r--r-- | share/mk/bsd.own.mk | 2 | ||||
| -rw-r--r-- | usr.bin/make/Makefile | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index e74000a..dfa8ed6 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -251,6 +251,7 @@ __DEFAULT_YES_OPTIONS = \ BIND_UTILS \ BINUTILS \ BLUETOOTH \ + BMAKE \ BOOT \ BSD_CPIO \ BSNMP \ @@ -360,7 +361,6 @@ __DEFAULT_NO_OPTIONS = \ BIND_LIBS \ BIND_SIGCHASE \ BIND_XML \ - BMAKE \ BSDCONFIG \ BSD_GREP \ CLANG_EXTRAS \ diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 5442eaa..5bc8b87 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -111,4 +111,11 @@ CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\" .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"." .endif +.if ${MK_BMAKE} != "no" +# if we are here we don't want this called 'make' +PROG= fmake +fmake.1: make.1 + cp ${.ALLSRC} ${.TARGET} +.endif + .include <bsd.prog.mk> |
