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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
