Mercurial > hg > icedtea7

changeset 2822:5f024eba68e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2534: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does 2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2534: 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 Tue, 14 Jul 2015 22:06:23 +0100
parents d5ae2c250a3f
children a3c123889979
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 14 22:02:48 2015 +0100
+++ b/ChangeLog	Tue Jul 14 22:06:23 2015 +0100
@@ -1,3 +1,11 @@
+2015-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2534: 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>
 
 	PR2533: Allow greater control of Javadoc
--- a/Makefile.am	Tue Jul 14 22:02:48 2015 +0100
+++ b/Makefile.am	Tue Jul 14 22:06:23 2015 +0100
@@ -2858,9 +2858,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	Tue Jul 14 22:02:48 2015 +0100
+++ b/NEWS	Tue Jul 14 22:06:23 2015 +0100
@@ -329,6 +329,7 @@
   - PR2531: Location of docs directory in install-data-local is incorrect
   - PR2532: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR
   - PR2533: Allow greater control of Javadoc installation directory
+  - PR2534: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
 * AArch64 port
   - Add copyright to aarch64_ad.m4
   - S8069593: Changes to JavaThread::_thread_state must use acquire and release