svn commit: r270244 - in stable/10: bin/sh/tests/builtins tools/build/mk

[Jilles Tjoelker]

Author: jilles
Date: Wed Aug 20 19:39:07 2014
New Revision: 270244
URL: http://svnweb.freebsd.org/changeset/base/270244

Log:
  MFC r268429: 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)
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  stable/10/bin/sh/tests/builtins/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/sh/tests/builtins/Makefile
==============================================================================
--- stable/10/bin/sh/tests/builtins/Makefile	Wed Aug 20 19:37:05 2014	(r270243)
+++ stable/10/bin/sh/tests/builtins/Makefile	Wed Aug 20 19:39:07 2014	(r270244)
@@ -92,7 +92,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: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Aug 20 19:37:05 2014	(r270243)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Aug 20 19:39:07 2014	(r270244)
@@ -3336,9 +3336,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