[svn] GnuPG - r4382 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2006-12-13 22:41:37 +0100 (Wed, 13 Dec 2006)
New Revision: 4382

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/Makefile.am
Log:
* Makefile.am: Install options.skel via dist_pkgdata_DATA so that
"make uninstall" works properly.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-12-13 19:48:31 UTC (rev 4381)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-12-13 21:41:37 UTC (rev 4382)
@@ -1,3 +1,8 @@
+2006-12-13  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am: Install options.skel via dist_pkgdata_DATA so that
+	"make uninstall" works properly.
+
 2006-12-13  Werner Koch  <wk at g10code.com>
 
 	* gpgv.c, gpg.c: Do not include the now removed g10defs.h file.

Modified: branches/STABLE-BRANCH-1-4/g10/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/Makefile.am	2006-12-13 19:48:31 UTC (rev 4381)
+++ branches/STABLE-BRANCH-1-4/g10/Makefile.am	2006-12-13 21:41:37 UTC (rev 4382)
@@ -21,7 +21,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl @LIBUSB_CPPFLAGS@
 
-EXTRA_DIST = options.skel
 # it seems that we can't use this with automake 1.5
 #OMIT_DEPENDENCIES = zlib.h zconf.h
 
@@ -36,6 +35,7 @@
 other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
 
 bin_PROGRAMS = gpg gpgv
+dist_pkgdata_DATA = options.skel
 
 if ENABLE_BZIP2_SUPPORT
 bzip2_source = compress-bz2.c
@@ -133,10 +133,7 @@
 
 $(PROGRAMS): $(needed_libs)
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) $(srcdir)/options.skel \
-				$(DESTDIR)$(pkgdatadir)/options.skel
+install-exec-hook:
 	@set -e;\
 	 if test -f $(DESTDIR)$(bindir)/gpgm ; then \
 	   echo "removing obsolete gpgm binary" ;   \