Index: g10/Makefile.am
--- g10/Makefile.am.orig	2007-10-23 09:50:35 +0200
+++ g10/Makefile.am	2007-12-21 09:06:51 +0100
@@ -24,9 +24,9 @@
 
 if ! HAVE_DOSISH_SYSTEM
 AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
-AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
-AM_CPPFLAGS += -DGNUPG_DATADIR="\"$(pkgdatadir)\""
-AM_CPPFLAGS += -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\""
+AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@1\""
+AM_CPPFLAGS += -DGNUPG_DATADIR="\"$(pkgdatadir)1\""
+AM_CPPFLAGS += -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@1\""
 endif
 
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
Index: keyserver/Makefile.in
--- keyserver/Makefile.in.orig	2007-12-20 08:54:09 +0100
+++ keyserver/Makefile.in	2007-12-21 09:15:58 +0100
@@ -312,7 +312,7 @@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
 EXTRA_SCRIPTS = gpgkeys_mailto
-gpglibexecdir = $(libexecdir)/@PACKAGE@
+gpglibexecdir = $(libexecdir)/@PACKAGE@1
 gpglibexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_CURL@
 gpglibexec_SCRIPTS = @GPGKEYS_MAILTO@
 noinst_SCRIPTS = gpgkeys_test