From owner-svn-src-all@FreeBSD.ORG  Tue Jul  8 21:50:14 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4AE9DAF4;
 Tue,  8 Jul 2014 21:50:14 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 383FB2505;
 Tue,  8 Jul 2014 21:50:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68LoEZA015055;
 Tue, 8 Jul 2014 21:50:14 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68LoDSw015053;
 Tue, 8 Jul 2014 21:50:13 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201407082150.s68LoDSw015053@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Tue, 8 Jul 2014 21:50:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268429 - in head: bin/sh/tests/builtins tools/build/mk
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.18
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: Tue, 08 Jul 2014 21:50:14 -0000

Author: jilles
Date: Tue Jul  8 21:50:13 2014
New Revision: 268429
URL: http://svnweb.freebsd.org/changeset/base/268429

Log:
  Don't install locale1.0 if MK_NLS == no.
  
  The test locale1.0 depends on locale support; it is meaningless without a
  working LC_MESSAGES.
  
  I added an OptionalObsoleteFiles.inc entry.
  
  PR:		181151
  Submitted by:	Garrett Cooper (original version)
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/bin/sh/tests/builtins/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/bin/sh/tests/builtins/Makefile
==============================================================================
--- head/bin/sh/tests/builtins/Makefile	Tue Jul  8 21:48:57 2014	(r268428)
+++ head/bin/sh/tests/builtins/Makefile	Tue Jul  8 21:50:13 2014	(r268429)
@@ -99,7 +99,9 @@ FILES+=		local1.0
 FILES+=		local2.0
 FILES+=		local3.0
 FILES+=		local4.0
+.if ${MK_NLS} != "no"
 FILES+=		locale1.0
+.endif
 FILES+=		printf1.0
 FILES+=		printf2.0
 FILES+=		printf3.0

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Jul  8 21:48:57 2014	(r268428)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Jul  8 21:50:13 2014	(r268429)
@@ -3382,9 +3382,10 @@ OLD_FILES+=var/yp/Makefile
 OLD_FILES+=var/yp/Makefile.dist
 .endif
 
-#.if ${MK_NLS} == no
+.if ${MK_NLS} == no
+OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0
 # to be filled in
-#.endif
+.endif
 
 .if ${MK_NTP} == no
 OLD_FILES+=etc/ntp.conf