changeset 7230:1a8d338654d5

Prefer using configmake.h instead of augmenting DEFS.
author Bruno Haible <bruno@clisp.org>
date Tue, 29 Aug 2006 15:44:02 +0000
parents 16163abcf553
children 1ec266612c4f
files ChangeLog lib/ChangeLog lib/localcharset.c modules/localcharset
diffstat 4 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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:
--- 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) == '\\')
--- a/modules/localcharset
+++ b/modules/localcharset
@@ -12,6 +12,7 @@
 m4/localcharset.m4
 
 Depends-on:
+configmake
 
 configure.ac:
 gl_LOCALCHARSET
@@ -19,7 +20,6 @@
 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