Re: [bug-gnulib] Re: proposed gnulib module 'configmake', plus use by 'localcharset'

[Bruno Haible]

> +       echo '#define LIBDIR "$(libdir)"'; \

Thanks. I now did this change.

2006-08-29  Bruno Haible  <address@hidden>

        * modules/localcharset (Depends-on): Add configmake.
        (Makefile.am): Remove setting of LIBDIR through DEFS.
        * lib/localcharset.c: Include configmake.h in order to get LIBDIR 
defined.

*** modules/localcharset        22 Sep 2004 15:11:04 -0000      1.6
--- modules/localcharset        29 Aug 2006 15:40:50 -0000
***************
*** 12,17 ****
--- 12,18 ----
  m4/localcharset.m4
  
  Depends-on:
+ configmake
  
  configure.ac:
  gl_LOCALCHARSET
***************
*** 19,25 ****
  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
--- 20,25 ----
*** lib/localcharset.c  31 Jul 2006 16:09:08 -0000      1.23
--- lib/localcharset.c  29 Aug 2006 15:40:50 -0000
***************
*** 66,71 ****
--- 66,76 ----
  # 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) == '\\')