summaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2015-05-16 02:14:49 -0400
committerCarlos O'Donell <carlos@systemhalted.org>2015-05-16 02:14:49 -0400
commit6c307927ac5c5c3e15774a1c63c9d8c41f3a8678 (patch)
tree7590de410cf0bf6d8a24dad933273e66145ea64e /localedata
parentc3cc2cf35a18474ce76e128861816bab10bec5c1 (diff)
downloadglibc-6c307927ac5c5c3e15774a1c63c9d8c41f3a8678.tar.gz
Fail locale installation if localedef fails.
If any locale fails to compile then the installation of locales via `make localedata/install-locales` also fails.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/Makefile4
2 files changed, 7 insertions, 3 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8b7a4140c3..1f2577de3e 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,4 +1,8 @@
-2015-05-12 Marko Myllynen <myllynen@redhat.com>
+2015-05-16 Carlos O'Donell <carlos@redhat.com>
+
+ * Makefile (INSTALL-SUPPORTED-LOCALES): Fail if localedef fails.
+
+2015-05-16 Marko Myllynen <myllynen@redhat.com>
* locales/bo_CN (LC_NAME): Fix compilation.
* locales/bo_IN (LC_NAME): Likewise.
diff --git a/localedata/Makefile b/localedata/Makefile
index 03ec98c0e0..305c87f9d3 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -212,8 +212,8 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
$(LOCALEDEF) --alias-file=../intl/locale.alias \
-i locales/$$input -c -f charmaps/$$charset \
- $(addprefix --prefix=,$(install_root)) $$locale; \
- echo ' done'; \
+ $(addprefix --prefix=,$(install_root)) $$locale \
+ && echo ' done'; \
tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP
tst-wctype-ENV = LC_ALL=ja_JP.EUC-JP