diff options
| author | sjg <sjg@FreeBSD.org> | 2015-04-21 04:40:38 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-04-21 04:40:38 +0000 |
| commit | af117d16cb9971b98daadf0901466cbf38bd45b5 (patch) | |
| tree | d4404a0b758eb6a0547daa01b5eec4d7df64362f /contrib/bmake/Makefile | |
| parent | 909d1933055072a88a7712a6e880c731d40fce75 (diff) | |
| parent | bee1aeb88e274fb1036152cf5e1176049e2dc417 (diff) | |
| download | FreeBSD-src-af117d16cb9971b98daadf0901466cbf38bd45b5.zip FreeBSD-src-af117d16cb9971b98daadf0901466cbf38bd45b5.tar.gz | |
Merge bmake-20150418
PR: 199486
Diffstat (limited to 'contrib/bmake/Makefile')
| -rw-r--r-- | contrib/bmake/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/bmake/Makefile b/contrib/bmake/Makefile index 42258c4..9a0abc6 100644 --- a/contrib/bmake/Makefile +++ b/contrib/bmake/Makefile @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.27 2014/06/20 14:51:54 sjg Exp $ +# $Id: Makefile,v 1.36 2015/04/18 19:58:53 sjg Exp $ # Base version on src date -MAKE_VERSION= 20140620 +MAKE_VERSION= 20150418 PROG= bmake @@ -180,9 +180,9 @@ COPTS.parse.c += -Wno-format-nonliteral COPTS.var.c += -Wno-format-nonliteral # Force these -SHAREDIR= ${prefix}/share -BINDIR= ${prefix}/bin -MANDIR= ${SHAREDIR}/man +SHAREDIR= ${SHAREDIR.bmake:U${prefix}/share} +BINDIR= ${BINDIR.bmake:U${prefix}/bin} +MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man} .if !exists(.depend) ${OBJS}: config.h |
