Date: Thu, 16 May 2013 15:28:38 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250699 - in head: share/mk usr.bin/make Message-ID: <201305161528.r4GFSc5t094460@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Thu May 16 15:28:38 2013 New Revision: 250699 URL: http://svnweb.freebsd.org/changeset/base/250699 Log: Build bmake by default. If someone explicitly builds usr.bin/make while MK_BMAKE==yes, install it as 'fmake'. Reviewed by: brooks Modified: head/share/mk/bsd.own.mk head/usr.bin/make/Makefile Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Thu May 16 14:38:12 2013 (r250698) +++ head/share/mk/bsd.own.mk Thu May 16 15:28:38 2013 (r250699) @@ -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 \ Modified: head/usr.bin/make/Makefile ============================================================================== --- head/usr.bin/make/Makefile Thu May 16 14:38:12 2013 (r250698) +++ head/usr.bin/make/Makefile Thu May 16 15:28:38 2013 (r250699) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305161528.r4GFSc5t094460>