summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2013-01-24 15:18:41 +0000
committerbrooks <brooks@FreeBSD.org>2013-01-24 15:18:41 +0000
commitfd309737271993754984c9d12d5bd3f86e3fac12 (patch)
tree646875585ed22cf788c7e6fd09f26d4c9e2069fc
parentfbe181c5230d8e563277939bd6fb652a637d82b2 (diff)
downloadFreeBSD-src-fd309737271993754984c9d12d5bd3f86e3fac12.zip
FreeBSD-src-fd309737271993754984c9d12d5bd3f86e3fac12.tar.gz
Reorder so that NO_MAN is declared before bsd.own.mk is included and thus
has an effect (not installed a g++.1 manpage over the g++.1(.gz) link created in ../cc).
-rw-r--r--gnu/usr.bin/cc/c++/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index f434b34..54e8561 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
.include "../Makefile.inc"
.include "../Makefile.fe"
@@ -9,13 +7,16 @@
PROG= g++
SRCS+= g++spec.c
-.if ${MK_CLANG_IS_CC} == "no"
-LINKS= ${BINDIR}/g++ ${BINDIR}/c++
-LINKS+= ${BINDIR}/g++ ${BINDIR}/CC
-.endif
NO_MAN=
DPADD= ${LIBCPP} ${LIBIBERTY}
LDADD= ${LIBCPP} ${LIBIBERTY}
+.include <bsd.own.mk>
+
+.if ${MK_CLANG_IS_CC} == "no"
+LINKS= ${BINDIR}/g++ ${BINDIR}/c++
+LINKS+= ${BINDIR}/g++ ${BINDIR}/CC
+.endif
+
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud