# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1460076670 -3600
# Node ID b81654c4ba532795334c5927e3c2523d93855988
# Parent  9e5bab0925d7c27df1afb1daa79a5d75aa9c12ff
PR2921: Uninstallation of docs deletes too much

2016-04-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR2921: Uninstallation of docs deletes too much
	* Makefile.am:
	(uninstall-local): Don't delete docs from the
	build directory. Instead, do the inverse of the
	installation step, removing each item copied over
	by the install.
	* NEWS: Updated.

diff -r 9e5bab0925d7 -r b81654c4ba53 ChangeLog
--- a/ChangeLog	Fri Apr 08 01:38:11 2016 +0100
+++ b/ChangeLog	Fri Apr 08 01:51:10 2016 +0100
@@ -1,3 +1,13 @@
+2016-04-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2921: Uninstallation of docs deletes too much
+	* Makefile.am:
+	(uninstall-local): Don't delete docs from the
+	build directory. Instead, do the inverse of the
+	installation step, removing each item copied over
+	by the install.
+	* NEWS: Updated.
+
 2016-04-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2920: PaX marking fails on filesystems which
diff -r 9e5bab0925d7 -r b81654c4ba53 Makefile.am
--- a/Makefile.am	Fri Apr 08 01:38:11 2016 +0100
+++ b/Makefile.am	Fri Apr 08 01:51:10 2016 +0100
@@ -2872,7 +2872,9 @@
 	rm -vf $(DESTDIR)${prefix}/jre/.systemPrefs/.system.lock
 	rm -vf $(DESTDIR)${prefix}/jre/.systemPrefs/.systemRootModFile
 if ENABLE_DOCS
-	rm -rvf $(BUILD_OUTPUT_DIR)/docs/* $(DESTDIR)$(htmldir)
+	for items in $(BUILD_OUTPUT_DIR)/docs/*; do \
+	  rm -rvf $(DESTDIR)$(htmldir)/$$(basename $${items}); \
+	done
 	$(RMDIR) $(DESTDIR)$(htmldir)
 endif
 	for vms in client server ; do \
diff -r 9e5bab0925d7 -r b81654c4ba53 NEWS
--- a/NEWS	Fri Apr 08 01:38:11 2016 +0100
+++ b/NEWS	Fri Apr 08 01:51:10 2016 +0100
@@ -164,6 +164,7 @@
   - PR2917: Don't pass --with-cacerts-file to build if USE_ALT_CACERTS_FILE is not set
   - PR2918: Makefile handles cacerts as a symlink, but the configure check doesn't
   - PR2920: PaX marking fails on filesystems which don't support extended attributes
+  - PR2921: Uninstallation of docs deletes too much
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck