security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

* Makefile.am: Install options.skel via dist_pkgdata_DATA so that

Browse Source 
"make uninstall" works properly.
This commit is contained in:
David Shaw 2006-12-13 21:41:37 +00:00
parent db8b1120a1
commit ea5397943a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View 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> 2006-12-13 Werner Koch <wk@g10code.com>
* gpgv.c, gpg.c: Do not include the now removed g10defs.h file. * gpgv.c, gpg.c: Do not include the now removed g10defs.h file.

7
g10/Makefile.am
View File

@ -21,7 +21,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl @LIBUSB_CPPFLAGS@ 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 # it seems that we can't use this with automake 1.5
#OMIT_DEPENDENCIES = zlib.h zconf.h #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) other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
bin_PROGRAMS = gpg gpgv bin_PROGRAMS = gpg gpgv
dist_pkgdata_DATA = options.skel
if ENABLE_BZIP2_SUPPORT if ENABLE_BZIP2_SUPPORT
bzip2_source = compress-bz2.c bzip2_source = compress-bz2.c
@ -133,10 +133,7 @@ gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
$(PROGRAMS): $(needed_libs) $(PROGRAMS): $(needed_libs)
install-data-local: install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) $(srcdir)/options.skel \
$(DESTDIR)$(pkgdatadir)/options.skel
@set -e;\ @set -e;\
if test -f $(DESTDIR)$(bindir)/gpgm ; then \ if test -f $(DESTDIR)$(bindir)/gpgm ; then \
echo "removing obsolete gpgm binary" ; \ echo "removing obsolete gpgm binary" ; \