Mercurial > hg > release > icedtea-1.10
view patches/icedtea-pregenerated-nimbus.patch @ 1812:f915b5bb3fc7
For pre-generated Nimbus, turn on DISABLE_NIMBUS but patch it out
for make/javax/swing/plaf.
2009-05-21 Andrew John Hughes <ahughes@redhat.com>
* patches/icedtea-stop-nimbus-generation.patch:
Renamed.
* Makefile.am:
Turn on DISABLE_NIMBUS unless generating files.
To still build, apply the pregenerated-nimbus patch.
* patches/icedtea-pregenerated-nimbus.patch:
Turns the make/javax/swing/plaf/nimbus subdirectory
back on.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Thu, 21 May 2009 16:44:10 +0100 |
parents | patches/icedtea-stop-nimbus-generation.patch@5b10caa4c7fd |
children | a9c10241b227 |
line wrap: on
line source
diff -Nru openjdk.orig/jdk/make/javax/swing/plaf/Makefile openjdk/jdk/make/javax/swing/plaf/Makefile --- openjdk.orig/jdk/make/javax/swing/plaf/Makefile 2009-05-21 16:40:04.000000000 +0100 +++ openjdk/jdk/make/javax/swing/plaf/Makefile 2009-05-21 16:40:19.000000000 +0100 @@ -34,9 +34,7 @@ # include FILES.gmk AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf -ifndef DISABLE_NIMBUS - SUBDIRS = nimbus -endif +SUBDIRS = nimbus # Nimbus is handled in its own directory AUTO_JAVA_PRUNE = nimbus