Fix missing dependency of localedata tests on gconv-modules

(cherry picked from commit 234333153e5b29fec2c0b383249db6f245a877e9)

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index e2f26deecd213dd39dfa889e2fbcc65fcaa2b8d8..4cb9e616aa952ee14575e9acea4128f22d8b605d 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-16  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       * Makefile: Add missing gconv-modules dependency.
+
 2010-01-25  Andreas Schwab  <schwab@redhat.com>
 
        * locales/i18n: Don't map U00DF to U1E9E in toupper table.

diff --git a/localedata/Makefile b/localedata/Makefile
index d364001551d6fc04889724859558048f03919395..8f356ec8614401ef5ddae622d38d3f9ab9975842 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -107,6 +107,8 @@ install-others := $(addprefix $(inst_i18ndir)/, \
                              $(addsuffix .gz, $(charmaps)) \
                              $(locales))
 
+tests: $(objdir)/iconvdata/gconv-modules
+
 include ../Rules
 
 # Install the charmap files in gzipped format.
@@ -298,3 +300,6 @@ tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \
                LOCPATH=$(common-objpfx)localedata
 $(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
        $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
+
+$(objdir)/iconvdata/gconv-modules:
+       $(MAKE) -C ../iconvdata subdir=iconvdata $@