aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--keyserver/ChangeLog6
-rw-r--r--keyserver/Makefile.am2
2 files changed, 7 insertions, 1 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index d4889ebbf..34d7edb9b 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-03 David Shaw <[email protected]>
+
+ * Makefile.am: The harmless "ignored error" on gpgkeys_ldap
+ install on top of an existing install is bound to confuse people.
+ Use ln -s -f to force the overwrite.
+
2004-10-28 David Shaw <[email protected]>
* gpgkeys_finger.c [_WIN32] (connect_server): Fix typo.
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 37698ca6a..ac172f4f0 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -41,7 +41,7 @@ gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LI
install-exec-hook:
if GPGKEYS_LDAP
- -(cd $(libexecdir) && $(LN_S) gpgkeys_ldap$(EXEEXT) gpgkeys_ldaps$(EXEEXT))
+ (cd $(libexecdir) && $(LN_S) -f gpgkeys_ldap$(EXEEXT) gpgkeys_ldaps$(EXEEXT))
endif
uninstall-hook: