summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2014-07-08 21:50:13 +0000
committerjilles <jilles@FreeBSD.org>2014-07-08 21:50:13 +0000
commit6b378329a2ef6133f8de6a6c9b4471d7e07d32c7 (patch)
tree06a84ebca3a6750818eee75fa8a1d7328a8bd3e5 /tools
parent845f7be2e3cb9e7390f482dafd84462d8a2e1bb1 (diff)
downloadFreeBSD-src-6b378329a2ef6133f8de6a6c9b4471d7e07d32c7.zip
FreeBSD-src-6b378329a2ef6133f8de6a6c9b4471d7e07d32c7.tar.gz
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
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 8259b2b..6ec4847 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -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
OpenPOWER on IntegriCloud