diff options
| author | Werner Koch <wk@gnupg.org> | 2004-08-31 09:57:33 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2004-08-31 09:57:33 +0200 |
| commit | 452e415784b5bed128ed1ae517110361e5212c8c (patch) | |
| tree | 168c2ccf6db4db9c04ab9a9aa2d64baf7478b302 | |
| parent | * kbxutil.c: New command --import-openpgp. (diff) | |
| download | gnupg2-452e415784b5bed128ed1ae517110361e5212c8c.tar.xz gnupg2-452e415784b5bed128ed1ae517110361e5212c8c.zip | |
* openfile.c (copy_options_file): Use gpg-conf.skel
* Makefile.am: Install options.skel as gpg-conf.skel.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/Makefile.am | 2 | ||||
| -rw-r--r-- | g10/openfile.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e472a626f..429ab368d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2004-08-31 Werner Koch <wk@g10code.de> + + * openfile.c (copy_options_file): Use gpg-conf.skel + * Makefile.am: Install options.skel as gpg-conf.skel. + 2004-08-18 Marcus Brinkmann <marcus@g10code.de> * passphrase.c (agent_get_passphrase): Fix detection of gpg-agent diff --git a/g10/Makefile.am b/g10/Makefile.am index fc33acf73..53d748ee0 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -117,5 +117,5 @@ $(PROGRAMS): $(needed_libs) install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(INSTALL_DATA) $(srcdir)/options.skel \ - $(DESTDIR)$(pkgdatadir)/options.skel + $(DESTDIR)$(pkgdatadir)/gpg-conf.skel diff --git a/g10/openfile.c b/g10/openfile.c index 7dbbf7d6a..663c2c5d3 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -309,7 +309,7 @@ copy_options_file( const char *destdir ) return; fname = xmalloc ( strlen(datadir) + strlen(destdir) + 15 ); - strcpy(stpcpy(fname, datadir), DIRSEP_S "options" SKELEXT ); + strcpy(stpcpy(fname, datadir), DIRSEP_S "gpg-conf" SKELEXT ); src = fopen( fname, "r" ); if( !src ) { log_error(_("%s: can't open: %s\n"), fname, strerror(errno) ); |