diff options
| author | David Shaw <[email protected]> | 2006-12-13 21:41:37 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-12-13 21:41:37 +0000 |
| commit | ea5397943a5d0e2078ec2041145bef094819ffb7 (patch) | |
| tree | 3c8fdd456584bff981a71ea1a4a9a6250dd892bc | |
| parent | distribute gnupg1.info. Fixes bug#740. (diff) | |
| download | gnupg-ea5397943a5d0e2078ec2041145bef094819ffb7.tar.gz gnupg-ea5397943a5d0e2078ec2041145bef094819ffb7.zip | |
* Makefile.am: Install options.skel via dist_pkgdata_DATA so that
"make uninstall" works properly.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/Makefile.am | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index ed014aa84..3c9e6db62 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2006-12-13 David Shaw <[email protected]> + + * Makefile.am: Install options.skel via dist_pkgdata_DATA so that + "make uninstall" works properly. + 2006-12-13 Werner Koch <[email protected]> * gpgv.c, gpg.c: Do not include the now removed g10defs.h file. diff --git a/g10/Makefile.am b/g10/Makefile.am index 86a629ea9..74a8db1d2 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -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" ; \ |