# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1612487259 0
# Node ID 829af384e88f9641444a8d5e8c004e22cec4437b
# Parent  3e5f9de2f852c14da0d734e826c119eaf4bb4f19
PR3819: Installation can't handle existing tapset symlinks

2021-02-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR3819: Installation can't handle existing
	tapset symlinks
	* Makefile.am:
	(install-exec-local): Forcibly create symlink.
	* NEWS: Updated.

diff -r 3e5f9de2f852 -r 829af384e88f ChangeLog
--- a/ChangeLog	Fri Feb 05 00:55:48 2021 +0000
+++ b/ChangeLog	Fri Feb 05 01:07:39 2021 +0000
@@ -1,3 +1,11 @@
+2021-02-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3819: Installation can't handle existing
+	tapset symlinks
+	* Makefile.am:
+	(install-exec-local): Forcibly create symlink.
+	* NEWS: Updated.
+
 2021-02-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to icedtea-3.18.0.
diff -r 3e5f9de2f852 -r 829af384e88f Makefile.am
--- a/Makefile.am	Fri Feb 05 00:55:48 2021 +0000
+++ b/Makefile.am	Fri Feb 05 01:07:39 2021 +0000
@@ -3085,7 +3085,7 @@
 	  ${mkinstalldirs} $${stapdest} ; \
 	  tapname=$$(basename $${files}); \
 	  destname=$${tapname/./-@JAVA_VER@.} ; \
-	  ln -s ${prefix}/tapset/$${tapname} $${stapdest}/$${destname} ; \
+	  ln -sf ${prefix}/tapset/$${tapname} $${stapdest}/$${destname} ; \
 	done
 endif
 endif
diff -r 3e5f9de2f852 -r 829af384e88f NEWS
--- a/NEWS	Fri Feb 05 00:55:48 2021 +0000
+++ b/NEWS	Fri Feb 05 01:07:39 2021 +0000
@@ -120,6 +120,8 @@
   - JDK-8225072: Add LuxTrust certificate that is expiring in March 2021 to list of allowed but expired certs
   - JDK-8239105: Add exception for expiring Digicert root certificates to VerifyCACerts test
   - JDK-8258630: Add expiry exception for QuoVadis root certificate
+* Bug fixes
+  - PR3819: Installation can't handle existing tapset symlinks
 * Shenandoah
   - Shenandoah: Fix racy update of code roots
 * AArch32 port