security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

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

Browse Source 
$libexecdir.
This commit is contained in:
David Shaw 2005-03-17 23:14:47 +00:00
parent ff93f3528a
commit e19aa2e3ea
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2005-03-17 David Shaw <dshaw@jabberwocky.com> 2005-03-17 David Shaw <dshaw@jabberwocky.com>
* Makefile.am: Calculate GNUPG_LIBEXECDIR directly. Do not
redefine $libexecdir.
* options.h, keyserver.c (parse_keyserver_options, * options.h, keyserver.c (parse_keyserver_options,
keyserver_spawn): Don't treat 'verbose' and 'include-disabled' as keyserver_spawn): Don't treat 'verbose' and 'include-disabled' as
special. Just pass them through silently to the keyserver helper. special. Just pass them through silently to the keyserver helper.

16
g10/Makefile.am
View File

@ -1,5 +1,5 @@
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2004 Free Software Foundation, Inc. # 2005 Free Software Foundation, Inc.
# #
# This file is part of GnuPG. # This file is part of GnuPG.
# #
@ -23,14 +23,13 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
EXTRA_DIST = options.skel EXTRA_DIST = options.skel
# it seems that we can't use this with automake 1.5 # it seems that we can't use this with automake 1.5
#OMIT_DEPENDENCIES = zlib.h zconf.h #OMIT_DEPENDENCIES = zlib.h zconf.h
libexecdir = @libexecdir@/@PACKAGE@
if ! HAVE_DOSISH_SYSTEM if ! HAVE_DOSISH_SYSTEM
AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
endif endif
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
#noinst_PROGRAMS = gpgd
bin_PROGRAMS = gpg gpgv bin_PROGRAMS = gpg gpgv
if ENABLE_BZIP2_SUPPORT if ENABLE_BZIP2_SUPPORT
@ -125,13 +124,6 @@ gpgv_SOURCES = gpgv.c \
$(common_source) \ $(common_source) \
verify.c 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@ LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@ gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@