/hg/release/icedtea6-1.11: Add nss.cfg to j2re-image as well.

[andrew at icedtea.classpath.org]

changeset 1e8299b45e2b in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=1e8299b45e2b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 09 13:38:18 2012 +0100

	Add nss.cfg to j2re-image as well.

	2012-05-09  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		(add-nss): Copy nss.cfg to j2re-image as well.
		(clean-add-nss): Remove nss.cfg from j2re-image.
		(add-nss-debug): Same as for add-nss.
		(clean-add-nss-debug): Same as for clean-add-nss.
		(add-nss-ecj): Same as for add-nss.
		(clean-add-nss-ecj): Same as for clean-add-nss.


diffstat:

 ChangeLog   |  10 ++++++++++
 Makefile.am |   9 +++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diffs (60 lines):

diff -r 0568483b07ce -r 1e8299b45e2b ChangeLog
--- a/ChangeLog	Wed May 09 16:25:56 2012 +0100
+++ b/ChangeLog	Wed May 09 13:38:18 2012 +0100
@@ -1,3 +1,13 @@
+2012-05-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(add-nss): Copy nss.cfg to j2re-image as well.
+	(clean-add-nss): Remove nss.cfg from j2re-image.
+	(add-nss-debug): Same as for add-nss.
+	(clean-add-nss-debug): Same as for clean-add-nss.
+	(add-nss-ecj): Same as for add-nss.
+	(clean-add-nss-ecj): Same as for clean-add-nss.
+
 2012-03-16  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR600, 886:
diff -r 0568483b07ce -r 1e8299b45e2b Makefile.am
--- a/Makefile.am	Wed May 09 16:25:56 2012 +0100
+++ b/Makefile.am	Wed May 09 13:38:18 2012 +0100
@@ -1586,19 +1586,25 @@
 stamps/add-nss.stamp: stamps/icedtea.stamp
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security
+	cp $(abs_top_builddir)/nss.cfg \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/security
 	touch stamps/add-nss.stamp
 
 clean-add-nss:
 	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
 	rm -f stamps/add-nss.stamp
 
 stamps/add-nss-debug.stamp: stamps/icedtea-debug.stamp
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+	cp $(abs_top_builddir)/nss.cfg \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security;
 	touch stamps/add-nss-debug.stamp
 
 clean-add-nss-debug:
 	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
 	rm -f stamps/add-nss-debug.stamp
 
 stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
@@ -1703,10 +1709,13 @@
 stamps/add-nss-ecj.stamp: stamps/icedtea-ecj.stamp
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+	cp $(abs_top_builddir)/nss.cfg \
+	  $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security;
 	touch stamps/add-nss-ecj.stamp
 
 clean-add-nss-ecj:
 	rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+	rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
 	rm -f stamps/add-nss-ecj.stamp
 
 stamps/add-tzdata-support-ecj.stamp: stamps/icedtea-ecj.stamp