jaxp/make/Makefile
Print this page
rev 99 : Use ALT_DROP_DIR to specify location of drops and extract in build directory.
@@ -85,18 +85,22 @@
_SLASHJAVA=/java
endif
endif
# Where is /java/devtools in case we need it
-ifdef ALT_JDK_DEVTOOLS_DIR
- _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR)
+ifdef ALT_DROP_DIR
+ DROP_DIR = $(ALT_DROP_DIR)
else
- _DEVTOOLS = $(_SLASHJAVA)/devtools
+ ifdef ALT_JDK_DEVTOOLS_DIR
+ DROP_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+ else
+ DROP_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+ endif
endif
# Add in path to devtools
-ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS)
+ANT_OPTIONS += -Ddropdir=$(DROP_DIR)
ifdef ALT_OUTPUTDIR
OUTPUTDIR = $(ALT_OUTPUTDIR)
ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
else