* Makefile.am (AM_CPPFLAGS): Pass directory constants via -D; this
authorWerner Koch <wk@gnupg.org>
Thu, 12 Feb 2004 09:29:42 +0000 (09:29 +0000)
committerWerner Koch <wk@gnupg.org>
Thu, 12 Feb 2004 09:29:42 +0000 (09:29 +0000)
will allow to override directory names at make time.

sm/ChangeLog
sm/Makefile.am
sm/gpgsm.c

index 7c44833..77807d0 100644 (file)
@@ -1,3 +1,8 @@
+2004-02-11  Werner Koch  <wk@gnupg.org>
+
+       * Makefile.am (AM_CPPFLAGS): Pass directory constants via -D; this
+       will allow to override directory names at make time.
+
 2004-02-02  Werner Koch  <wk@gnupg.org>
 
        * import.c (check_and_store): Import certificates even with
index 6345573..1ac7cbe 100644 (file)
 
 ## Process this file with automake to produce Makefile.in
 
-localedir = $(datadir)/locale
-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
 
 bin_PROGRAMS = gpgsm
 
-AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl \
-              $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS)
+
+AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl 
+include $(top_srcdir)/am/cmacros.am
+
 
 gpgsm_SOURCES = \
        gpgsm.c gpgsm.h \
@@ -52,4 +53,4 @@ gpgsm_SOURCES = \
 
 gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a ../common/libcommon.a \
                $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(KSBA_LIBS) -lgpg-error \
-               @INTLLIBS@
+              $(INTLLIBS)
index c8d76af..d1da02c 100644 (file)
@@ -1480,7 +1480,7 @@ open_fwrite (const char *filename)
 static void
 run_protect_tool (int argc, char **argv)
 {
-  char *pgm = GNUPG_PROTECT_TOOL;
+  char *pgm = GNUPG_DEFAULT_PROTECT_TOOL;
   char **av;
   int i;