[svn] GnuPG - r4370 - in branches/STABLE-BRANCH-1-4: . g10

[svn author wk]

Author: wk
Date: 2006-12-07 12:33:24 +0100 (Thu, 07 Dec 2006)
New Revision: 4370

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/configure.ac
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/Makefile.am
   branches/STABLE-BRANCH-1-4/g10/openfile.c
Log:
/
        * 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.


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2006-12-06 16:38:34 UTC (rev 4369)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2006-12-07 11:33:24 UTC (rev 4370)
@@ -1,3 +1,7 @@
+2006-12-07  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Remove GNUPG_DATADIR for non-W32 systems.
+
 2006-12-06  Werner Koch  <wk at g10code.com>
 
 	Released 1.4.6.

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2006-12-06 16:38:34 UTC (rev 4369)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2006-12-07 11:33:24 UTC (rev 4370)
@@ -1348,7 +1348,6 @@
 #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

Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-12-06 16:38:34 UTC (rev 4369)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-12-07 11:33:24 UTC (rev 4370)
@@ -1,3 +1,9 @@
+2006-12-07  Werner Koch  <wk at 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 at g10code.com>
 
 	* filter.h (armor_filter_context_t): New field REFCOUNT.

Modified: branches/STABLE-BRANCH-1-4/g10/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/Makefile.am	2006-12-06 16:38:34 UTC (rev 4369)
+++ branches/STABLE-BRANCH-1-4/g10/Makefile.am	2006-12-07 11:33:24 UTC (rev 4370)
@@ -27,6 +27,7 @@
 
 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

Modified: branches/STABLE-BRANCH-1-4/g10/openfile.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/openfile.c	2006-12-06 16:38:34 UTC (rev 4369)
+++ branches/STABLE-BRANCH-1-4/g10/openfile.c	2006-12-07 11:33:24 UTC (rev 4370)
@@ -345,7 +345,7 @@
         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 @@
       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;