From owner-svn-src-all@FreeBSD.ORG  Thu Jan 24 15:18:42 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 89D316C6;
 Thu, 24 Jan 2013 15:18:42 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 762DEEB2;
 Thu, 24 Jan 2013 15:18:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0OFIgB7081068;
 Thu, 24 Jan 2013 15:18:42 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0OFIg15081067;
 Thu, 24 Jan 2013 15:18:42 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301241518.r0OFIg15081067@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 24 Jan 2013 15:18:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245882 - head/gnu/usr.bin/cc/c++
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jan 2013 15:18:42 -0000

Author: brooks
Date: Thu Jan 24 15:18:41 2013
New Revision: 245882
URL: http://svnweb.freebsd.org/changeset/base/245882

Log:
  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).

Modified:
  head/gnu/usr.bin/cc/c++/Makefile

Modified: head/gnu/usr.bin/cc/c++/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/c++/Makefile	Thu Jan 24 15:14:22 2013	(r245881)
+++ head/gnu/usr.bin/cc/c++/Makefile	Thu Jan 24 15:18:41 2013	(r245882)
@@ -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>