From de09fe7fca22e9d1448cdc10e16aecd1953ea4ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Tue, 21 Jul 2015 13:00:32 +0200 Subject: [PATCH] cldr-plurals: Fix --enable-relocatable compilation Compilation of the cldr-plurals tool was broken in the relocatable case because of missing CPPFLAGS/LDFLAGS. Add the same flags used by other tools to the makefile. * gettext-tools/src/Makefile.am (cldr_plurals_CPPFLAGS) (cldr_plurals_LDFLAGS): Adjust for --enable-relocatable compilation. --- gettext-tools/src/ChangeLog | 10 ++++++++++ gettext-tools/src/Makefile.am | 2 ++ 2 files changed, 12 insertions(+) diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 668550513..2731e6fbe 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,13 @@ +2015-07-21 Václav Slavík (tiny change) + + cldr-plurals: Fix --enable-relocatable compilation + Compilation of the cldr-plurals tool was broken in the relocatable + case because of missing CPPFLAGS/LDFLAGS. Add the same flags used + by other tools to the makefile. + * Makefile.am (cldr_plurals_CPPFLAGS) + (cldr_plurals_LDFLAGS): Adjust for --enable-relocatable + compilation. + 2015-07-10 Daiki Ueno * gettext 0.19.5 released. diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index 4d610180e..7b1b9982c 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -333,6 +333,7 @@ msguniq_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\" recode_sr_latin_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\" hostname_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(pkglibdir)\" urlget_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(pkglibdir)\" +cldr_plurals_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(pkglibdir)\" if RELOCATABLE_VIA_LD msgcmp_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)` msgfmt_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)` @@ -352,6 +353,7 @@ msguniq_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)` recode_sr_latin_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)` hostname_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(pkglibdir)` urlget_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(pkglibdir)` +cldr_plurals_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(pkglibdir)` endif # Linking with C++ libraries is needed _only_ on mingw and Cygwin. -- 2.47.3