diff options
author | sjg <sjg@FreeBSD.org> | 2015-06-11 04:00:22 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2015-06-11 04:00:22 +0000 |
commit | d1ba9a9c7960b49fb03416eef3275c579b47908b (patch) | |
tree | b26d94d85563c87e7520b133bb14893b5697a039 /usr.bin/bmake | |
parent | 7e7e822da19cf60cf9de6df938781bc539018838 (diff) | |
download | FreeBSD-src-d1ba9a9c7960b49fb03416eef3275c579b47908b.zip FreeBSD-src-d1ba9a9c7960b49fb03416eef3275c579b47908b.tar.gz |
Merge bmake-20150606
Only change to bmake is man page - document .OBJDIR target.
We also get latest dirdeps.mk and friends.
> Description of fields to fill in above: 76 columns --|
> PR: If a GNATS PR is affected by the change.
> Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed).
> Submitted by: If someone else sent in the change.
> Reviewed by: If someone else reviewed your modification.
> Approved by: If you needed approval for this commit.
> Obtained from: If the change is from a third party.
> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email.
> MFH: Ports tree branch name. Request approval for merge.
> Relnotes: Set to 'yes' for mention in release notes.
> Security: Vulnerability reference (one per line) or description.
> Sponsored by: If the change was sponsored by an organization.
> Empty fields above will be automatically removed.
_M contrib/bmake
M contrib/bmake/ChangeLog
M contrib/bmake/Makefile
M contrib/bmake/bmake.1
M contrib/bmake/bmake.cat1
M contrib/bmake/make.1
M contrib/bmake/mk/ChangeLog
M contrib/bmake/mk/dirdeps.mk
M contrib/bmake/mk/gendirdeps.mk
M contrib/bmake/mk/install-mk
M contrib/bmake/mk/meta.stage.mk
M contrib/bmake/mk/meta.sys.mk
M contrib/bmake/mk/mkopt.sh
M contrib/bmake/targ.c
M usr.bin/bmake/Makefile
Diffstat (limited to 'usr.bin/bmake')
-rw-r--r-- | usr.bin/bmake/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 4abb45fe..4f83731 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -14,10 +14,10 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.38 2015/05/05 21:58:05 sjg Exp $ +# $Id: Makefile,v 1.39 2015/06/07 15:54:37 sjg Exp $ # Base version on src date -MAKE_VERSION= 20150505 +MAKE_VERSION= 20150606 PROG?= ${.CURDIR:T} |