--- gnupg-1.4.1/g10/Makefile.am.orig	2005-01-03 18:15:34 +0300

+++ gnupg-1.4.1/g10/Makefile.am	2005-03-17 16:51:39 +0300

@@ -138,9 +138,9 @@ gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ 

 $(PROGRAMS): $(needed_libs)

 install-data-local:

-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)

+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gnupg

 	$(INSTALL_DATA) $(srcdir)/options.skel \

-				$(DESTDIR)$(pkgdatadir)/options.skel

+				$(DESTDIR)$(sysconfdir)/gnupg/options.skel

 	@set -e;\

 	 if test -f $(DESTDIR)$(bindir)/gpgm ; then \

 	   echo "removing obsolete gpgm binary" ;   \

--- gnupg-1.4.1/configure.ac.orig	2005-03-15 18:51:52 +0300

+++ gnupg-1.4.1/configure.ac	2005-03-17 16:51:39 +0300

@@ -1303,7 +1303,7 @@ cat >g10defs.tmp <<G10EOF

 #else

 #define G10_LOCALEDIR     "${datadir}/locale"

 #define GNUPG_LIBDIR      "${libdir}/gnupg"

-#define GNUPG_DATADIR     "${datadir}/gnupg"

+#define GNUPG_DATADIR     "/etc/gnupg"

 #ifdef __VMS

 #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" 

 #else