# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1242922467 -3600
# Node ID a9c10241b2279c1e7df693b6cb7974af99ca3ff4
# Parent  5adda0d4b9f56b82f2ba920634367132f81c4cb2
Avoid invoking the generator in the Nimbus makefile.

2009-05-21  Andrew John Hughes  <ahughes@redhat.com>

	* patches/icedtea-pregenerated-nimbus.patch:
	Also patch the Nimbus Makefile to not set
	CLASSES_INIT and thus avoid invoking the
	generator.

diff -r 5adda0d4b9f5 -r a9c10241b227 ChangeLog
--- a/ChangeLog	Thu May 21 17:09:13 2009 +0100
+++ b/ChangeLog	Thu May 21 17:14:27 2009 +0100
@@ -1,3 +1,10 @@
+2009-05-21  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-pregenerated-nimbus.patch:
+	Also patch the Nimbus Makefile to not set
+	CLASSES_INIT and thus avoid invoking the
+	generator.
+
 2009-05-21  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/ecj/icedtea-pr39408.patch:
diff -r 5adda0d4b9f5 -r a9c10241b227 patches/icedtea-pregenerated-nimbus.patch
--- a/patches/icedtea-pregenerated-nimbus.patch	Thu May 21 17:09:13 2009 +0100
+++ b/patches/icedtea-pregenerated-nimbus.patch	Thu May 21 17:14:27 2009 +0100
@@ -12,3 +12,15 @@
  
  # Nimbus is handled in its own directory
  AUTO_JAVA_PRUNE = nimbus
+diff -Nru openjdk.orig/jdk/make/javax/swing/plaf/nimbus/Makefile openjdk/jdk/make/javax/swing/plaf/nimbus/Makefile
+--- openjdk.orig/jdk/make/javax/swing/plaf/nimbus/Makefile	2009-05-08 16:10:44.000000000 +0100
++++ openjdk/jdk/make/javax/swing/plaf/nimbus/Makefile	2009-05-21 17:12:39.000000000 +0100
+@@ -44,8 +44,6 @@
+ #
+ # Rules
+ #
+-CLASSES_INIT = $(NIMBUS_GENSRC_DIR)
+-
+ include $(BUILDDIR)/common/Classes.gmk
+ 
+ $(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR)