aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2010-04-14 17:56:22 +0000
committerWerner Koch <[email protected]>2010-04-14 17:56:22 +0000
commit6616ba9a1ed4fa3abededdecf390586f73c713c4 (patch)
treea89712513f8ab2c4300eaa80ec083b9c70c028a5
parentRemove dependency to simple-pwquery. (diff)
downloadgnupg-6616ba9a1ed4fa3abededdecf390586f73c713c4.tar.gz
gnupg-6616ba9a1ed4fa3abededdecf390586f73c713c4.zip
Fixed dependencies and a syntax error
Diffstat (limited to '')
-rw-r--r--common/sysutils.c4
-rw-r--r--tools/ChangeLog1
-rw-r--r--tools/Makefile.am4
3 files changed, 7 insertions, 2 deletions
diff --git a/common/sysutils.c b/common/sysutils.c
index 46731271b..9e5717649 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -526,7 +526,7 @@ gnupg_remove (const char *fname)
gpg_err_set_errno (EIO);
return !rc;
#else
- return remove;
+ return remove (fname);
#endif
}
@@ -590,7 +590,7 @@ gnupg_mkdir (const char *name, const char *modestr)
if (*modestr && *modestr++ == 'x')
mode |= S_IXOTH;
}
- return mkdir (home, mode)
+ return mkdir (name, mode);
#endif
}
diff --git a/tools/ChangeLog b/tools/ChangeLog
index aeb2313ac..b3e846a53 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -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 <[email protected]>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4bdeacb88..017bde0c5 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -60,7 +60,11 @@ noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
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)