Skip to content

Commit

Permalink
Fail locale installation if localedef fails.
Browse files Browse the repository at this point in the history
If any locale fails to compile then the installation
of locales via `make localedata/install-locales`
also fails.
  • Loading branch information
Carlos O'Donell committed May 16, 2015
1 parent c3cc2cf commit 6c30792
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion localedata/ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions localedata/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6c30792

Please sign in to comment.