make/Makefile

changeset 92
600bc3d048be
parent 91
cc35f0e129d2
child 95
4023edcd8433
equal deleted inserted replaced
91:cc35f0e129d2 92:600bc3d048be
84 else 84 else
85 _SLASHJAVA=/java 85 _SLASHJAVA=/java
86 endif 86 endif
87 endif 87 endif
88 88
89 # Where is /java/devtools in case we need it 89 # Do we have the drops already downloaded?
90 ifdef ALT_JDK_DEVTOOLS_DIR 90 # Check ALT_DROPS_DIR for a full path first,
91 _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR) 91 # before trying to use the devtools path,
92 else 92 # either via ALT_JDK_DEVTOOLS_DIR or /java/devtools.
93 _DEVTOOLS = $(_SLASHJAVA)/devtools 93 ifdef ALT_DROPS_DIR
94 endif 94 DROPS_DIR = $(ALT_DROPS_DIR)
95 95 else
96 # Add in path to devtools 96 ifdef ALT_JDK_DEVTOOLS_DIR
97 ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS) 97 DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
98 else
99 DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
100 endif
101 endif
102
103 # Add in path to drops already downloaded
104 ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
98 105
99 ifdef ALT_OUTPUTDIR 106 ifdef ALT_OUTPUTDIR
100 OUTPUTDIR = $(ALT_OUTPUTDIR) 107 OUTPUTDIR = $(ALT_OUTPUTDIR)
101 ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR) 108 ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
102 else 109 else

mercurial