diff options
| author | Daniel Kahn Gillmor <[email protected]> | 2017-04-17 14:51:55 +0000 |
|---|---|---|
| committer | Daniel Kahn Gillmor <[email protected]> | 2017-04-17 14:51:55 +0000 |
| commit | 55b00bcc305e2e4ef928b2c9aa1eb6ce261ad78a (patch) | |
| tree | 48c5076ea64c276d31e9cdab565abd285ba11dff /g10/Makefile.am | |
| parent | agent: More minor change. (diff) | |
| download | gnupg-dkg/no-skel-files.tar.gz gnupg-dkg/no-skel-files.zip | |
g10: remove skeleton options filesdkg/no-skel-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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/Makefile.am | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am index f1d2d1734..142b2f3cd 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 @@ -238,18 +238,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)' \ |