security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-04 20:38:50 +01:00
Code Activity

/

Browse Source 
* 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.
This commit is contained in:
Werner Koch 2006-12-07 11:33:24 +00:00
parent 818f65f42a
commit abfdbea116
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-12-07 Werner Koch <wk@g10code.com>
* configure.ac: Remove GNUPG_DATADIR for non-W32 systems.
2006-12-06 Werner Koch <wk@g10code.com> 2006-12-06 Werner Koch <wk@g10code.com>
Released 1.4.6. Released 1.4.6.

1
configure.ac
View File

@ -1348,7 +1348,6 @@ cat >g10defs.tmp <<G10EOF
#else #else
#define G10_LOCALEDIR "${datadir}/locale" #define G10_LOCALEDIR "${datadir}/locale"
#define GNUPG_LIBDIR "${libdir}/gnupg" #define GNUPG_LIBDIR "${libdir}/gnupg"
#define GNUPG_DATADIR "${datadir}/gnupg"
#ifdef __VMS #ifdef __VMS
#define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg"
#else #else

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2006-12-07 Werner Koch <wk@g10code.com>
* 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 <wk@g10code.com> 2006-12-04 Werner Koch <wk@g10code.com>
* filter.h (armor_filter_context_t): New field REFCOUNT. * filter.h (armor_filter_context_t): New field REFCOUNT.

1
g10/Makefile.am
View File

@ -27,6 +27,7 @@ EXTRA_DIST = options.skel
if ! HAVE_DOSISH_SYSTEM if ! HAVE_DOSISH_SYSTEM
AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\"" AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
AM_CPPFLAGS += -DGNUPG_DATADIR="\"$(pkgdatadir)\""
endif endif
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a

4
g10/openfile.c
View File

@ -345,7 +345,7 @@ copy_options_file( const char *destdir )
errno = EPERM; errno = EPERM;
} }
if( !src ) { 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); xfree(fname);
return; return;
} }
@ -360,7 +360,7 @@ copy_options_file( const char *destdir )
dst = fopen( fname, "w" ); dst = fopen( fname, "w" );
umask(oldmask); umask(oldmask);
if( !dst ) { 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 ); fclose( src );
xfree(fname); xfree(fname);
return; return;