changeset 2995:7111f936f154 icedtea-2.6.18

PR3739: PR2886 breaks make clean 2019-05-01 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3739: PR2886 breaks make clean * Makefile.am: (clean-tests): Drop removal of test directory as it will no longer be empty at this point. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 02 May 2019 02:46:11 +0100
parents 682300ac729c
children 2c2e903f14d9
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 01 22:13:51 2019 +0100
+++ b/ChangeLog	Thu May 02 02:46:11 2019 +0100
@@ -1,3 +1,11 @@
+2019-05-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3739: PR2886 breaks make clean
+	* Makefile.am:
+	(clean-tests): Drop removal of test directory as
+	it will no longer be empty at this point.
+	* NEWS: Updated.
+
 2019-05-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3737: Use https URLs where possible.
--- a/Makefile.am	Wed May 01 22:13:51 2019 +0100
+++ b/Makefile.am	Thu May 02 02:46:11 2019 +0100
@@ -938,11 +938,6 @@
 clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports \
  clean-check-ecc clean-check-mimetype clean-check-java-debug \
  clean-check-java-src
-	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
-	  if [ -e test ] ; then \
-	    rmdir test ; \
-	  fi \
-	fi
 
 clean-local: clean-tests \
  clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
--- a/NEWS	Wed May 01 22:13:51 2019 +0100
+++ b/NEWS	Thu May 02 02:46:11 2019 +0100
@@ -41,6 +41,7 @@
   - PR3732: Use SDK bin directory in jconsole.desktop.in
   - PR3733: Use shortened Java version first in Name field of desktop files
   - PR3737: Use https URLs where possible.
+  - PR3739: PR2886 breaks make clean
 * AArch64 port
   - S8219635, PR3726: aarch64: missing LoadStore barrier in TemplateTable::fast_storefield
   - S8221220, PR3726: AArch64: Add StoreStore membar explicitly for Volatile Writes in TemplateTable