# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1243010697 -3600
# Node ID 9e6600d4fef20ae59d3414311a5b1b65e96701b2
# Parent  6124157d5bdb2bc74b72df95c41a590992a093e2# Parent  1d35cf933a99679f22a31a1488b194e1c0f89601
Merge.

diff -r 6124157d5bdb -r 9e6600d4fef2 ChangeLog
--- a/ChangeLog	Fri May 22 01:12:07 2009 +0100
+++ b/ChangeLog	Fri May 22 17:44:57 2009 +0100
@@ -1,3 +1,10 @@
+2009-05-22  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Copy over Nimbus source files manually
+	rather than using generated as GENSRC
+	to avoid conflicts with IcedTea6.
+
 2009-05-21  Andrew John Hughes  <ahughes@redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp:
diff -r 6124157d5bdb -r 9e6600d4fef2 Makefile.am
--- a/Makefile.am	Fri May 22 01:12:07 2009 +0100
+++ b/Makefile.am	Fri May 22 17:44:57 2009 +0100
@@ -1581,11 +1581,6 @@
 	"ALT_JAR_CMD=$(ALT_JAR_CMD)"
 endif
 
-if !ENABLE_NIMBUS_GENERATION
-ICEDTEA_ENV += \
-	"GENSRCDIR=$(abs_top_builddir)/generated"
-endif
-
 env:
 	@echo 'unset JAVA_HOME'
 	@echo 'export $(ICEDTEA_ENV)'
@@ -3140,6 +3135,10 @@
 	ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR)
 	ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR)
 	ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR)
+else
+	mkdir -p $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf
+	cp -a $(abs_topbuilddir)/generated/javax/swing/plaf/nimbus \
+	  $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf
 endif
 endif
 	mkdir -p stamps