gnupg/g10 (ChangeLog Makefile.am)

[cvs user dshaw]

    Date: Friday, March 18, 2005 @ 00:14:47
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog Makefile.am

* Makefile.am: Calculate GNUPG_LIBEXECDIR directly.  Do not redefine
$libexecdir.


-------------+
 ChangeLog   |    3 +++
 Makefile.am |   16 ++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.707 gnupg/g10/ChangeLog:1.708
--- gnupg/g10/ChangeLog:1.707	Thu Mar 17 23:55:17 2005
+++ gnupg/g10/ChangeLog	Fri Mar 18 00:14:47 2005
@@ -1,5 +1,8 @@
 2005-03-17  David Shaw  <dshaw at jabberwocky.com>
 
+	* Makefile.am: Calculate GNUPG_LIBEXECDIR directly.  Do not
+	redefine $libexecdir.
+
 	* options.h, keyserver.c (parse_keyserver_options,
 	keyserver_spawn): Don't treat 'verbose' and 'include-disabled' as
 	special.  Just pass them through silently to the keyserver helper.
Index: gnupg/g10/Makefile.am
diff -u gnupg/g10/Makefile.am:1.89 gnupg/g10/Makefile.am:1.90
--- gnupg/g10/Makefile.am:1.89	Mon Jan  3 16:15:34 2005
+++ gnupg/g10/Makefile.am	Fri Mar 18 00:14:47 2005
@@ -1,5 +1,5 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
-#               2004 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+#               2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -23,14 +23,13 @@
 EXTRA_DIST = options.skel
 # it seems that we can't use this with automake 1.5
 #OMIT_DEPENDENCIES = zlib.h zconf.h
-libexecdir = @libexecdir@/@PACKAGE@
+
 if ! HAVE_DOSISH_SYSTEM
-AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
+AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
 endif
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
 
-#noinst_PROGRAMS = gpgd
 bin_PROGRAMS = gpg gpgv
 
 if ENABLE_BZIP2_SUPPORT
@@ -125,13 +124,6 @@
 	      $(common_source)  \
 	      verify.c          
 
-#gpgd_SOURCES = gpgd.c \
-#	       ks-proto.h \
-#	       ks-proto.c \
-#	       ks-db.c \
-#	       ks-db.h \
-#	       $(common_source)
-
 LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
 gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@