/hg/release/icedtea7-forest-2.5/jaxws: PR1753: Ant does not resp...

[andrew at icedtea.classpath.org]

changeset 3a7c902a4390 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=3a7c902a4390
author: andrew
date: Tue Apr 29 21:54:42 2014 +0100

	PR1753: Ant does not respect JAVA_HOME/jdk.home setting


diffstat:

 make/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 9639895f6950 -r 3a7c902a4390 make/Makefile
--- a/make/Makefile	Fri Apr 18 06:40:54 2014 +0100
+++ b/make/Makefile	Tue Apr 29 21:54:42 2014 +0100
@@ -101,13 +101,13 @@
 ifdef ALT_LANGTOOLS_DIST
   ifdef ALT_BOOTDIR
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-    ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
+    ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR)
   endif
   ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
 else
   ifdef ALT_JDK_IMPORT_PATH
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
-    ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
+    ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH)
   endif
 endif