summaryrefslogtreecommitdiffstats
path: root/g10/Makefile.am
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2017-04-17 16:51:55 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2017-05-02 11:55:32 +0200
commit201f86803017c1db373023f7b506d4a0dc644bbc (patch)
tree3e3dd318fc54e1e137782e84875a543888478ab1 /g10/Makefile.am
parentSpelling fixes in docs and comments. (diff)
downloadgnupg2-201f86803017c1db373023f7b506d4a0dc644bbc.tar.xz
gnupg2-201f86803017c1db373023f7b506d4a0dc644bbc.zip
g10: Remove skeleton options files.
* build-aux/speed/w32/inst.nsi: stop installing skeleton files. * doc/gpg.texi: stop documenting skeleton files. * g10/Makefile.am: stop installing skeleton files. * g10/openfile.c (copy_options_file): Remove. (try_make_homedir): do not call copy_options_file. -- The defaults for gpg and dirmngr are good. Both programs should work fine for the simple case without any config file. The skeleton config files were being copied at first use (when the defaults are fine). But when the user needs to fiddle with them (after they've become sophisticated users), they're likely out of date because gpg has been upgraded since then. So they're used for documentation, but they're stale documentation, which is probably worse than a clean empty file. GnuPG-bug-id: 3086 Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'g10/Makefile.am')
-rw-r--r--g10/Makefile.am8
1 files changed, 1 insertions, 7 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 4b806ec02..e6a173da8 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -18,7 +18,7 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = options.skel dirmngr-conf.skel distsigkey.gpg \
+EXTRA_DIST = distsigkey.gpg \
ChangeLog-2011 gpg-w32info.rc \
gpg.w32-manifest.in test.c t-keydb-keyring.kbx \
t-keydb-get-keyblock.gpg t-stutter-data.asc
@@ -240,18 +240,12 @@ install-exec-hook:
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- $(INSTALL_DATA) $(srcdir)/options.skel \
- $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
- $(INSTALL_DATA) $(srcdir)/dirmngr-conf.skel \
- $(DESTDIR)$(pkgdatadir)/dirmngr-conf.skel
$(INSTALL_DATA) $(srcdir)/distsigkey.gpg \
$(DESTDIR)$(pkgdatadir)/distsigkey.gpg
# NB: For uninstalling gpg and gpgv we use -local because there is
# no need for a specific order the targets need to be run.
uninstall-local:
- -@rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
- -@rm $(DESTDIR)$(pkgdatadir)/dirmngr-conf.skel
-@rm $(DESTDIR)$(pkgdatadir)/distsigkey.gpg
-@files=`for p in $(gpg2_hack_uninst); do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \