diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ChangeLog | 7 | ||||
| -rw-r--r-- | tools/Makefile.am | 9 | ||||
| -rw-r--r-- | tools/bftest.c | 2 | ||||
| -rw-r--r-- | tools/mpicalc.c | 2 | ||||
| -rw-r--r-- | tools/shmtest.c | 2 |
5 files changed, 18 insertions, 4 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 00455c619..00fe0b79d 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,10 @@ +2006-12-11 Werner Koch <[email protected]> + + * Makefile.am (AM_CPPFLAGS): Use in place of INCLUDES. Define + LOCALEDIR. + * shmtest.c (i18n_init): s/G10_LOCALEDIR/LOCALEDIR/. + * mpicalc.c (i18n_init): Ditto. + 2006-04-20 David Shaw <[email protected]> * make-dns-cert.c (main): Small exit code tweak from Peter diff --git a/tools/Makefile.am b/tools/Makefile.am index 5efe2c1a6..8a9c03560 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,10 +20,17 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = lspgpot ring-a-party mail-signed-keys convert-from-106 -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl + +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl + +if ! HAVE_DOSISH_SYSTEM +AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\"" +endif + needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) + bin_PROGRAMS = gpgsplit noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest make-dns-cert diff --git a/tools/bftest.c b/tools/bftest.c index 829c429a0..73a1196ae 100644 --- a/tools/bftest.c +++ b/tools/bftest.c @@ -50,7 +50,7 @@ i18n_init(void) { #ifdef ENABLE_NLS setlocale( LC_ALL, "" ); - bindtextdomain( PACKAGE, G10_LOCALEDIR ); + bindtextdomain (PACKAGE, LOCALEDIR); textdomain( PACKAGE ); #endif } diff --git a/tools/mpicalc.c b/tools/mpicalc.c index 915dcc32a..1df27d9d3 100644 --- a/tools/mpicalc.c +++ b/tools/mpicalc.c @@ -68,7 +68,7 @@ i18n_init(void) { #ifdef ENABLE_NLS setlocale( LC_ALL, "" ); - bindtextdomain( PACKAGE, G10_LOCALEDIR ); + bindtextdomain (PACKAGE, LOCALEDIR); textdomain( PACKAGE ); #endif } diff --git a/tools/shmtest.c b/tools/shmtest.c index f48340508..76513cbcd 100644 --- a/tools/shmtest.c +++ b/tools/shmtest.c @@ -57,7 +57,7 @@ i18n_init(void) { #ifdef ENABLE_NLS setlocale( LC_ALL, "" ); - bindtextdomain( PACKAGE, G10_LOCALEDIR ); + bindtextdomain (PACKAGE, LOCALEDIR); textdomain( PACKAGE ); #endif } |