[svn] GnuPG - r5308 - in trunk: common tools

[svn author wk]

Author: wk
Date: 2010-04-14 19:56:22 +0200 (Wed, 14 Apr 2010)
New Revision: 5308

Modified:
   trunk/common/sysutils.c
   trunk/tools/ChangeLog
   trunk/tools/Makefile.am
Log:
Fixed dependencies and a syntax error


Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2010-04-14 16:52:02 UTC (rev 5307)
+++ trunk/tools/ChangeLog	2010-04-14 17:56:22 UTC (rev 5308)
@@ -2,6 +2,7 @@
 
 	* Makefile.am (bin_PROGRAMS) [W32CE]: Exclude gpgkey2ssh.
 	(noinst_PROGRAMS) [W32CE]: Don't build them.
+	(pwquery_libs) [W32CE]: Set to empty.
 
 2010-03-25  Werner Koch  <wk at g10code.com>
 

Modified: trunk/common/sysutils.c
===================================================================
--- trunk/common/sysutils.c	2010-04-14 16:52:02 UTC (rev 5307)
+++ trunk/common/sysutils.c	2010-04-14 17:56:22 UTC (rev 5308)
@@ -526,7 +526,7 @@
     gpg_err_set_errno (EIO);
   return !rc;
 #else
-  return remove;
+  return remove (fname);
 #endif
 }
 
@@ -590,7 +590,7 @@
       if (*modestr && *modestr++ == 'x')
         mode |= S_IXOTH;
     }
-  return mkdir (home, mode)
+  return mkdir (name, mode);
 #endif
 }
 

Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am	2010-04-14 16:52:02 UTC (rev 5307)
+++ trunk/tools/Makefile.am	2010-04-14 17:56:22 UTC (rev 5308)
@@ -60,7 +60,11 @@
 endif
 
 common_libs = $(libcommon) ../gl/libgnu.a
+if HAVE_W32CE_SYSTEM
+pwquery_libs = 
+else
 pwquery_libs = ../common/libsimple-pwquery.a
+endif
 
 if HAVE_W32CE_SYSTEM
 opt_libassuan_libs = $(LIBASSUAN_LIBS)