1.1 --- a/make/Makefile Fri Oct 23 11:06:56 2009 -0700
1.2 +++ b/make/Makefile Thu Nov 05 00:02:38 2009 +0000
1.3 @@ -86,15 +86,22 @@
1.4 endif
1.5 endif
1.6
1.7 -# Where is /java/devtools in case we need it
1.8 -ifdef ALT_JDK_DEVTOOLS_DIR
1.9 - _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR)
1.10 +# Do we have the drops already downloaded?
1.11 +# Check ALT_DROPS_DIR for a full path first,
1.12 +# before trying to use the devtools path,
1.13 +# either via ALT_JDK_DEVTOOLS_DIR or /java/devtools.
1.14 +ifdef ALT_DROPS_DIR
1.15 + DROPS_DIR = $(ALT_DROPS_DIR)
1.16 else
1.17 - _DEVTOOLS = $(_SLASHJAVA)/devtools
1.18 + ifdef ALT_JDK_DEVTOOLS_DIR
1.19 + DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
1.20 + else
1.21 + DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
1.22 + endif
1.23 endif
1.24
1.25 -# Add in path to devtools
1.26 -ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS)
1.27 +# Add in path to drops already downloaded
1.28 +ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
1.29
1.30 ifdef ALT_OUTPUTDIR
1.31 OUTPUTDIR = $(ALT_OUTPUTDIR)
