# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1603782731 0
# Node ID 8a02d2f26a4f665a9c04c118458b01081efce0d1
# Parent  1f9e270d63c585a32372eca94c6eecded24e8e6d
PR3808: IcedTea does not install the JFR *.jfc files

2020-10-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR3808: IcedTea does not install the JFR *.jfc files
	* Makefile.am:
	(install-data-local): Create jre/lib/jfr directory
	and copy over *.jfc files.
	(uninstall-local): Remove JFR *.jfc files and
	jre/lib/jfr directory on uninstall.
	* NEWS: Updated.

diff -r 1f9e270d63c5 -r 8a02d2f26a4f ChangeLog
--- a/ChangeLog	Tue Oct 27 06:37:37 2020 +0000
+++ b/ChangeLog	Tue Oct 27 07:12:11 2020 +0000
@@ -1,3 +1,13 @@
+2020-10-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3808: IcedTea does not install the JFR *.jfc files
+	* Makefile.am:
+	(install-data-local): Create jre/lib/jfr directory
+	and copy over *.jfc files.
+	(uninstall-local): Remove JFR *.jfc files and
+	jre/lib/jfr directory on uninstall.
+	* NEWS: Updated.
+
 2020-10-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump aarch32 to jdk8u272-ga-aarch32-20201026.
diff -r 1f9e270d63c5 -r 8a02d2f26a4f Makefile.am
--- a/Makefile.am	Tue Oct 27 06:37:37 2020 +0000
+++ b/Makefile.am	Tue Oct 27 07:12:11 2020 +0000
@@ -3106,7 +3106,7 @@
 	${mkinstalldirs} $(DESTDIR)${prefix}/jre/.systemPrefs
 	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib
 	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
-	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security}
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,jfr,images/cursors,management,security}
 	${mkinstalldirs} $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1}
 	${mkinstalldirs} $(DESTDIR)${prefix}/demo
 	${mkinstalldirs} $(DESTDIR)${prefix}/sample
@@ -3137,6 +3137,9 @@
 	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/cmm; \
 	done
 	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/ext/meta-index $(DESTDIR)${prefix}/jre/lib/ext
+	for files in $(BUILD_SDK_DIR)/jre/lib/jfr/*.jfc; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/jfr; \
+	done
 	for files in $(BUILD_SDK_DIR)/jre/lib/images/cursors/*.gif; do \
 	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/images/cursors; \
 	done
@@ -3294,6 +3297,9 @@
 	  rm -vf $(DESTDIR)/${prefix}/jre/lib/cmm/$$(basename $${files}); \
 	done
 	rm -vf $(DESTDIR)${prefix}/jre/lib/ext/meta-index
+	for files in $(BUILD_SDK_DIR)/jre/lib/jfr/*.jfc; do \
+	  rm -vf $(DESTDIR)/${prefix}/jre/lib/jfr/$$(basename $${files}); \
+	done
 	for files in $(BUILD_SDK_DIR)/jre/lib/images/cursors/*.gif; do \
 	  rm -vf $(DESTDIR)${prefix}/jre/lib/images/cursors/$$(basename $${files}); \
 	done
@@ -3367,7 +3373,7 @@
 	$(RMDIR) $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
 	$(RMDIR) $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
 	$(RMDIR) $(DESTDIR)${prefix}/jre/lib/security/policy
-	$(RMDIR) $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security}
+	$(RMDIR) $(DESTDIR)${prefix}/jre/lib/{cmm,ext,jfr,images/cursors,management,security}
 	$(RMDIR) $(DESTDIR)${prefix}/jre/lib/images
 	$(RMDIR) $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
 	$(RMDIR) $(DESTDIR)${prefix}/jre/.systemPrefs
diff -r 1f9e270d63c5 -r 8a02d2f26a4f NEWS
--- a/NEWS	Tue Oct 27 06:37:37 2020 +0000
+++ b/NEWS	Tue Oct 27 07:12:11 2020 +0000
@@ -317,6 +317,7 @@
 * Bug fixes
   - PR3798: Fix format-overflow error on GCC 10, caused by passing NULL to a '%s' directive
   - PR3795: ECDSAUtils for XML digital signatures should support the same curve set as the rest of the JDK 
+  - PR3808: IcedTea does not install the JFR *.jfc files
 * Shenandoah
   - [backport] 8221435: Shenandoah should not mark through weak roots
   - [backport] 8221629: Shenandoah: Cleanup class unloading logic