[1.10, 1.11]: Add nss.cfg to j2re-image

[Dr Andrew John Hughes]

I'd like to backport the following simple fix to 1.10 and 1.11 in time
for today's release.  It's a correction of a simple oversight, spotted
by Pavel, which means that nss.cfg is only installed in j2sdk-image
and not j2re-image.

The patch is now on HEAD.

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.

Ok for 1.10 & 1.11?
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1605,19 +1605,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
@@ -1722,10 +1728,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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120509/9e86c216/attachment.bin