changeset 2587:f9e92005cb3e

PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does 2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does * Makefile.am: (install-data-local): Install missing files. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 18 Jun 2015 00:31:17 +0100
parents d9532d535bb7
children a366a80437b7
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 18 00:07:10 2015 +0100
+++ b/ChangeLog	Thu Jun 18 00:31:17 2015 +0100
@@ -1,3 +1,11 @@
+2015-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2448: Install TRADEMARK, COPYING and ChangeLog
+	as RPM spec file does
+	* Makefile.am:
+	(install-data-local): Install missing files.
+	* NEWS: Updated.
+
 2015-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2447: Allow greater control of Javadoc
--- a/Makefile.am	Thu Jun 18 00:07:10 2015 +0100
+++ b/Makefile.am	Thu Jun 18 00:31:17 2015 +0100
@@ -2475,9 +2475,12 @@
 	${INSTALL_DATA} $(srcdir)/NEWS $(DESTDIR)$(docdir)
 	${INSTALL_DATA} $(srcdir)/AUTHORS $(DESTDIR)$(docdir)
 	${INSTALL_DATA} $(srcdir)/HACKING $(DESTDIR)$(docdir)
+	${INSTALL_DATA} $(srcdir)/COPYING $(DESTDIR)$(docdir)
+	${INSTALL_DATA} $(srcdir)/ChangeLog $(DESTDIR)$(docdir)
 	${INSTALL_DATA} $(BUILD_SDK_DIR)/ASSEMBLY_EXCEPTION $(DESTDIR)$(docdir)
 	${INSTALL_DATA} $(BUILD_SDK_DIR)/LICENSE $(DESTDIR)$(docdir)
 	${INSTALL_DATA} $(BUILD_SDK_DIR)/THIRD_PARTY_README $(DESTDIR)$(docdir)
+	${INSTALL_DATA} openjdk/jaxp/TRADEMARK $(DESTDIR)$(docdir)
 	for sizes in 16 24 32 48 ; do \
 	  ${mkinstalldirs} $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps ; \
 	  ${INSTALL_DATA} openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon$${sizes}.png \
--- a/NEWS	Thu Jun 18 00:07:10 2015 +0100
+++ b/NEWS	Thu Jun 18 00:31:17 2015 +0100
@@ -110,6 +110,7 @@
   - PR2439: NSS PKCS11 regression - due to java.security automatic loading
   - PR2443: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR
   - PR2447: Allow greater control of Javadoc installation directory
+  - PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck