* Makefile.am: Install options.skel via dist_pkgdata_DATA so that
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 13 Dec 2006 21:41:37 +0000 (21:41 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 13 Dec 2006 21:41:37 +0000 (21:41 +0000)
"make uninstall" works properly.

g10/ChangeLog
g10/Makefile.am

index ed014aa..3c9e6db 100644 (file)
@@ -1,3 +1,8 @@
+2006-12-13  David Shaw  <dshaw@jabberwocky.com>
+
+       * Makefile.am: Install options.skel via dist_pkgdata_DATA so that
+       "make uninstall" works properly.
+
 2006-12-13  Werner Koch  <wk@g10code.com>
 
        * gpgv.c, gpg.c: Do not include the now removed g10defs.h file.
index 86a629e..74a8db1 100644 (file)
@@ -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 @@ needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 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 @@ gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
 
 $(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" ;   \