Mercurial > hg > icedtea12
changeset 2666:b81654c4ba53
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.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 08 Apr 2016 01:51:10 +0100 |
| parents | 9e5bab0925d7 |
| children | 72dabbf2cab2 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 \
--- 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