From fc5d768acab9a39f19f24ab5c6ce41d65d35cc35 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 29 Aug 2006 15:44:02 +0000 Subject: [PATCH] Prefer using configmake.h instead of augmenting DEFS. --- ChangeLog | 5 +++++ lib/ChangeLog | 4 ++++ lib/localcharset.c | 5 +++++ modules/localcharset | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1fd55cf754..6326da8146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-29 Bruno Haible + + * modules/localcharset (Depends-on): Add configmake. + (Makefile.am): Remove setting of LIBDIR through DEFS. + 2006-08-29 Paul Eggert * modules/configmake (Makefile.am): Add a comment, and omit diff --git a/lib/ChangeLog b/lib/ChangeLog index 68f25f79be..e7a76e9c32 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-08-29 Bruno Haible + + * localcharset.c: Include configmake.h in order to get LIBDIR defined. + 2006-08-29 Ralf Wildenhues Sync from Libtool: diff --git a/lib/localcharset.c b/lib/localcharset.c index cd44ca658c..7a2cdceb16 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -66,6 +66,11 @@ # define relocate(pathname) (pathname) #endif +/* Get LIBDIR. */ +#ifndef LIBDIR +# include "configmake.h" +#endif + #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ /* Win32, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') diff --git a/modules/localcharset b/modules/localcharset index b832700f1c..d45adb7622 100644 --- a/modules/localcharset +++ b/modules/localcharset @@ -12,6 +12,7 @@ m4/glibc21.m4 m4/localcharset.m4 Depends-on: +configmake configure.ac: gl_LOCALCHARSET @@ -19,7 +20,6 @@ gl_LOCALCHARSET Makefile.am: lib_SOURCES += localcharset.h localcharset.c EXTRA_DIST += config.charset ref-add.sin ref-del.sin -DEFS += -DLIBDIR=\"$(libdir)\" # We need the following in order to install a simple file in $(libdir) # which is shared with other installed packages. We use a list of referencing -- 2.30.2