Mercurial > hg > release > icedtea6-1.11

changeset 1957:284e36cb50ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add patch to correct environment variable. 2010-03-01 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Patch should be added to ICEDTEA_ECJ_PATCHES not ICEDTEA_ENV_ECJ.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 01 Mar 2010 16:05:43 +0000
parents 15ae6e3a64d2
children 86d208c50bb8
files ChangeLog Makefile.am
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 01 15:33:01 2010 +0000
+++ b/ChangeLog	Mon Mar 01 16:05:43 2010 +0000
@@ -1,3 +1,9 @@
+2010-03-01  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Patch should be added to ICEDTEA_ECJ_PATCHES
+	not ICEDTEA_ENV_ECJ.
+
 2010-03-01  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Mar 01 15:33:01 2010 +0000
+++ b/Makefile.am	Mon Mar 01 16:05:43 2010 +0000
@@ -382,6 +382,11 @@
 	patches/ecj/icedtea-jaxp-dependency.patch \
 	patches/ecj/bootver.patch
 
+if DTDTYPE_QNAME
+ICEDTEA_ECJ_PATCHES += \
+	patches/ecj/icedtea-jaxws-getdtdtype.patch
+endif
+
 # OpenJDK build environment.
 if ZERO_BUILD
   ICEDTEA_ZERO_BUILD = true
@@ -579,11 +584,6 @@
 	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
 endif
 
-if DTDTYPE_QNAME
-ICEDTEA_ENV_ECJ += \
-	patches/ecj/icedtea-jaxws-getdtdtype.patch
-endif
-
 # Source files
 # FIXME (distclean): Add generated file list
 # FIXME (distclean): Add jtreg sources