From owner-svn-src-stable@FreeBSD.ORG  Tue Mar 11 23:04:33 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3E70FC5E;
 Tue, 11 Mar 2014 23:04:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D6FFCEA9;
 Tue, 11 Mar 2014 23:04:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BN4W7A038699;
 Tue, 11 Mar 2014 23:04:32 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BN4Ww6038698;
 Tue, 11 Mar 2014 23:04:32 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201403112304.s2BN4Ww6038698@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 11 Mar 2014 23:04:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r263058 - stable/9/tools/build/options
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Mar 2014 23:04:33 -0000

Author: gjb
Date: Tue Mar 11 23:04:32 2014
New Revision: 263058
URL: http://svnweb.freebsd.org/changeset/base/263058

Log:
  MFC r253304, r255964:
  r253304:
    Ensure the locale is LC_ALL=C when regenerating
    src.conf.5
  
  r255964:
    Have makeman always use the mk files from the source
    tree it's operating on rather than those from the
    installed system.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/9/tools/build/options/makeman
Directory Properties:
  stable/9/tools/build/options/   (props changed)

Modified: stable/9/tools/build/options/makeman
==============================================================================
--- stable/9/tools/build/options/makeman	Tue Mar 11 22:47:04 2014	(r263057)
+++ stable/9/tools/build/options/makeman	Tue Mar 11 23:04:32 2014	(r263058)
@@ -3,12 +3,16 @@
 # This file is in the public domain.
 
 set -o errexit
+LC_ALL=C
 
 ident='$FreeBSD$'
 
 t=$(mktemp -d -t makeman)
 trap 'test -d $t && rm -rf $t' exit
 
+srcdir=$(realpath ../../..)
+make="make -C $srcdir -m $srcdir/share/mk"
+
 #
 # usage: no_targets all_targets yes_targets
 #
@@ -26,10 +30,10 @@ no_targets()
 
 show_options()
 {
-	ALL_TARGETS=$(echo $(make -C ../../.. targets | tail -n +2))
+	ALL_TARGETS=$(echo $(${make} targets | tail -n +2))
 	rm -f $t/settings
 	for target in ${ALL_TARGETS} ; do
-		make -C ../../.. showconfig \
+		${make} showconfig \
 		    SRCCONF=/dev/null __MAKE_CONF=/dev/null \
 		    TARGET_ARCH=${target#*/} TARGET=${target%/*} |
 		while read var _ val ; do
@@ -92,7 +96,7 @@ show()
 		exit 1
 		;;
 	esac
-	make -C ../../.. "$@" showconfig __MAKE_CONF=/dev/null |
+	${make} "$@" showconfig __MAKE_CONF=/dev/null |
 	while read var _ val ; do
 		opt=${var#MK_}
 		case ${val} in