From e2963095c0d04be40a335a2a07ed6732d786ac1b Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 6 Feb 2003 21:23:02 +0000 Subject: [PATCH] * Makefile.am: Pass GNUPG_LIBEXECDIR as part of CFLAGS so it can be easily overridden at make time. --- g10/ChangeLog | 5 +++++ g10/Makefile.am | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 65e074f5a..c542f767b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2003-02-06 David Shaw + + * Makefile.am: Pass GNUPG_LIBEXECDIR as part of CFLAGS so it can + be easily overridden at make time. + 2003-02-05 David Shaw * g10.c (print_hex, print_mds): Print long hash strings a lot diff --git a/g10/Makefile.am b/g10/Makefile.am index 13ac50b6d..5bb333f7a 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -22,7 +22,9 @@ INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl EXTRA_DIST = options.skel # it seems that we can't use this with automake 1.5 #OMIT_DEPENDENCIES = zlib.h zconf.h -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ +libexecdir = @libexecdir@/gnupg +CFLAGS = @CFLAGS@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a #noinst_PROGRAMS = gpgd