jaxws/make/Makefile
Print this page
@@ -84,19 +84,26 @@
else
_SLASHJAVA=/java
endif
endif
-# Where is /java/devtools in case we need it
-ifdef ALT_JDK_DEVTOOLS_DIR
- _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR)
+# Do we have the drops already downloaded?
+# Check ALT_DROPS_DIR for a full path first,
+# before trying to use the devtools path,
+# either via ALT_JDK_DEVTOOLS_DIR or /java/devtools.
+ifdef ALT_DROPS_DIR
+ DROPS_DIR = $(ALT_DROPS_DIR)
else
- _DEVTOOLS = $(_SLASHJAVA)/devtools
+ ifdef ALT_JDK_DEVTOOLS_DIR
+ DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+ else
+ DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+ endif
endif
-# Add in path to devtools
-ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS)
+# Add in path to drops already downloaded
+ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
ifdef ALT_OUTPUTDIR
OUTPUTDIR = $(ALT_OUTPUTDIR)
ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
else