Prefer using configmake.h instead of augmenting DEFS.

diff --git a/ChangeLog b/ChangeLog
index 1fd55cf754f442b974b86600f1190f7181b43c9b..6326da81464592751856dc7d24541b17c59c3968 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-29  Bruno Haible  <bruno@clisp.org>
+
+       * modules/localcharset (Depends-on): Add configmake.
+       (Makefile.am): Remove setting of LIBDIR through DEFS.
+
 2006-08-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * modules/configmake (Makefile.am): Add a comment, and omit

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 68f25f79bee6a4cf3287c1989564a817197f8ef4..e7a76e9c32ad8bd5a33dbfb05b5d47fa7c242a1f 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-29  Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c: Include configmake.h in order to get LIBDIR defined.
+
 2006-08-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Sync from Libtool:

diff --git a/lib/localcharset.c b/lib/localcharset.c
index cd44ca658c9451f3f6638f9d039388a198a35802..7a2cdceb165709534355d7c7439d0d5652501c22 100644 (file)
--- 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 b832700f1ce847caf6299b81da1cb48248207a81..d45adb7622980ffab54e202f1f9d8875dcc44272 100644 (file)
--- 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