diff options
| author | Werner Koch <[email protected]> | 2006-12-07 11:33:24 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-12-07 11:33:24 +0000 |
| commit | abfdbea1162934d8b0d9b2cb3ff23cdf1181f293 (patch) | |
| tree | 59da982e400030f1d58d87421c6f3f8f1b09a44e | |
| parent | Post release updates (diff) | |
| download | gnupg-abfdbea1162934d8b0d9b2cb3ff23cdf1181f293.tar.gz gnupg-abfdbea1162934d8b0d9b2cb3ff23cdf1181f293.zip | |
/
* configure.ac: Remove GNUPG_DATADIR for non-W32 systems.
g10/
* Makefile.am (AM_CPPFLAGS): Define GNUPG_DATADIR.
* openfile.c (copy_options_file): Use log_info and not log_error
to avoid error returns in case of a missing skeleton file.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/Makefile.am | 1 | ||||
| -rw-r--r-- | g10/openfile.c | 4 |
5 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2006-12-07 Werner Koch <[email protected]> + + * configure.ac: Remove GNUPG_DATADIR for non-W32 systems. + 2006-12-06 Werner Koch <[email protected]> Released 1.4.6. diff --git a/configure.ac b/configure.ac index 44b06daee..ceb5dccc5 100644 --- a/configure.ac +++ b/configure.ac @@ -1348,7 +1348,6 @@ cat >g10defs.tmp <<G10EOF #else #define G10_LOCALEDIR "${datadir}/locale" #define GNUPG_LIBDIR "${libdir}/gnupg" -#define GNUPG_DATADIR "${datadir}/gnupg" #ifdef __VMS #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" #else diff --git a/g10/ChangeLog b/g10/ChangeLog index 20d3ec178..fb12dc708 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2006-12-07 Werner Koch <[email protected]> + + * Makefile.am (AM_CPPFLAGS): Define GNUPG_DATADIR. + * openfile.c (copy_options_file): Use log_info and not log_error + to avoid error returns in case of a missing skeleton file. + 2006-12-04 Werner Koch <[email protected]> * filter.h (armor_filter_context_t): New field REFCOUNT. diff --git a/g10/Makefile.am b/g10/Makefile.am index fa4e0b536..0e7886190 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST = options.skel if ! HAVE_DOSISH_SYSTEM AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\"" +AM_CPPFLAGS += -DGNUPG_DATADIR="\"$(pkgdatadir)\"" endif needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a diff --git a/g10/openfile.c b/g10/openfile.c index c106cdbec..a6383a44a 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -345,7 +345,7 @@ copy_options_file( const char *destdir ) errno = EPERM; } if( !src ) { - log_error(_("can't open `%s': %s\n"), fname, strerror(errno) ); + log_info (_("can't open `%s': %s\n"), fname, strerror(errno) ); xfree(fname); return; } @@ -360,7 +360,7 @@ copy_options_file( const char *destdir ) dst = fopen( fname, "w" ); umask(oldmask); if( !dst ) { - log_error(_("can't create `%s': %s\n"), fname, strerror(errno) ); + log_info (_("can't create `%s': %s\n"), fname, strerror(errno) ); fclose( src ); xfree(fname); return; |