diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-08-03 11:40:15 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:13:51 +0200 |
| commit | 56b4690b151bcb99a5e3a7d1b55ba948a7b76054 (patch) | |
| tree | 9744f31ef5692a3b2fa2376daa128f274bff023a /gettext-runtime/src | |
| parent | 59d970b6da22e99b4b1d2b4dccd336514114ae89 (diff) | |
| download | external_gettext-56b4690b151bcb99a5e3a7d1b55ba948a7b76054.zip external_gettext-56b4690b151bcb99a5e3a7d1b55ba948a7b76054.tar.gz external_gettext-56b4690b151bcb99a5e3a7d1b55ba948a7b76054.tar.bz2 | |
Use gnulib inside gettext-runtime directory.
Diffstat (limited to 'gettext-runtime/src')
| -rw-r--r-- | gettext-runtime/src/ChangeLog | 6 | ||||
| -rw-r--r-- | gettext-runtime/src/Makefile.am | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog index 33de8ae..19e88f7 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,9 @@ +2006-07-31 Bruno Haible <bruno@clisp.org> + + * Makefile.am (AM_CPPFLAGS, LDADD, RELOCATABLE_SRC_DIR, + RELOCATABLE_BUILD_DIR): Replace lib and ../gettext-tools/lib with + gnulib-lib. + 2006-07-30 Bruno Haible <bruno@clisp.org> * Makefile.am (AM_CPPFLAGS): Replace gettext-tools/lib with diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am index 548c961..289d360 100644 --- a/gettext-runtime/src/Makefile.am +++ b/gettext-runtime/src/Makefile.am @@ -29,8 +29,7 @@ AM_CPPFLAGS = \ -I. -I$(srcdir) \ -I.. \ -I../intl -I$(srcdir)/../intl \ - -I../lib -I$(srcdir)/../lib \ - -I../../gettext-tools/gnulib-lib -I$(srcdir)/../../gettext-tools/gnulib-lib + -I../gnulib-lib -I$(srcdir)/../gnulib-lib DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ # Source dependencies. @@ -40,7 +39,7 @@ envsubst_SOURCES = envsubst.c # Link dependencies. # Need @LTLIBICONV@ because iconvstring.c uses iconv(). -LDADD = ../lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@ +LDADD = ../gnulib-lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@ # Specify installation directory, for --enable-relocatable. gettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\" @@ -58,7 +57,7 @@ DISTCLEANFILES += gettext.sh # Support for relocatability. RELOCATABLE_LIBRARY_PATH = $(libdir) -RELOCATABLE_SRC_DIR = $(top_srcdir)/../gettext-tools/lib -RELOCATABLE_BUILD_DIR = ../lib +RELOCATABLE_SRC_DIR = $(top_srcdir)/gnulib-lib +RELOCATABLE_BUILD_DIR = ../gnulib-lib RELOCATABLE_CONFIG_H_DIR = .. @SET_RELOCATABLE@ |