Mercurial > hg > release > icedtea6-1.10

changeset 2573:2491ffacf20e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add nss.cfg to j2re-image as well. 2012-05-09 Andrew John Hughes <ahughes@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.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 09 May 2012 13:38:18 +0100
parents 1939ae55a211
children 78c05cb3e3c7
files ChangeLog Makefile.am
diffstat 2 files changed, 19 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 11 15:55:05 2012 +0100
+++ b/ChangeLog	Wed May 09 13:38:18 2012 +0100
@@ -1,3 +1,13 @@
+2012-05-09  Andrew John Hughes  <ahughes@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-05-11  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS: Mention all fixes in NEWS.
--- a/Makefile.am	Fri May 11 15:55:05 2012 +0100
+++ b/Makefile.am	Wed May 09 13:38:18 2012 +0100
@@ -1558,19 +1558,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
@@ -1675,10 +1681,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