diff options
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 5 | ||||
| -rw-r--r-- | localedata/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 1857fc1f81..2bd966dc1f 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2014-02-26 Joseph Myers <joseph@codesourcery.com> + + * Makefile: Include Makeconfig immediately after defining subdir. + (all): Remove target. + 2014-02-21 Joseph Myers <joseph@codesourcery.com> * Makefile ($(objpfx)sort-test.out): Use $(evaluate-test). diff --git a/localedata/Makefile b/localedata/Makefile index a69ec41aee..881337452e 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -19,7 +19,7 @@ subdir := localedata -all: # Make this the default target; it will be defined in Rules. +include ../Makeconfig # List with all available character set descriptions. charmaps := $(wildcard charmaps/[A-I]*) $(wildcard charmaps/[J-Z]*) @@ -56,9 +56,6 @@ generated := $(test-input) $(test-output) sort-test.out tst-locale.out \ generated-dirs := $(ld-test-names) tt_TT de_DE.437 \ $(addprefix tstfmon_,$(fmon-tests)) \ -# Get $(inst_i18ndir) defined. -include ../Makeconfig - ifeq ($(run-built-tests),yes) locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \ tst_iswctype tst_iswdigit tst_iswgraph \ |