From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Wed, 17 Mar 2010 16:01:34 +0000 (-0700)
Subject: Fix missing dependency of localedata tests on gconv-modules
X-Git-Tag: fedora/glibc-2.11.1-7~1^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=877103176f621c64bdd847e2db49205de7e32e61;p=thirdparty%2Fglibc.git

Fix missing dependency of localedata tests on gconv-modules

(cherry picked from commit 234333153e5b29fec2c0b383249db6f245a877e9)
---

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index e2f26deecd2..4cb9e616aa9 100644
--- 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 d364001551d..8f356ec8614 100644
--- 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 $@