Mercurial > hg > release > icedtea-1.10
changeset 1824:1d35cf933a99
Avoid build conflicts when using IcedTea6 and pre-generated Nimbus.
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.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 22 May 2009 17:43:31 +0100 |
| parents | 082075fb775e |
| children | 9e6600d4fef2 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 21 20:10:28 2009 +0100 +++ b/ChangeLog Fri May 22 17:43:31 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> * acinclude.m4:
--- a/Makefile.am Thu May 21 20:10:28 2009 +0100 +++ b/Makefile.am Fri May 22 17:43:31 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