equal
deleted
inserted
replaced
111 endif |
111 endif |
112 |
112 |
113 ifdef ALT_LANGTOOLS_DIST |
113 ifdef ALT_LANGTOOLS_DIST |
114 ifdef ALT_BOOTDIR |
114 ifdef ALT_BOOTDIR |
115 ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) |
115 ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) |
|
116 ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) |
116 endif |
117 endif |
117 ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap |
118 ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap |
118 else |
119 else |
119 ifdef ALT_JDK_IMPORT_PATH |
120 ifdef ALT_JDK_IMPORT_PATH |
120 ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) |
121 ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) |
|
122 ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) |
121 endif |
123 endif |
122 endif |
124 endif |
123 |
125 |
124 ifdef ANT_HOME |
126 ifdef ANT_HOME |
125 ANT = $(ANT_HOME)/bin/ant |
127 ANT = $(ANT_HOME)/bin/ant |
139 # All ant targets of interest |
141 # All ant targets of interest |
140 ANT_TARGETS = all source drop_included build dist clobber clean sanity |
142 ANT_TARGETS = all source drop_included build dist clobber clean sanity |
141 |
143 |
142 # Create a make target for each |
144 # Create a make target for each |
143 $(ANT_TARGETS): |
145 $(ANT_TARGETS): |
144 cd .. && $(ANT_JAVA_HOME) $(ANT) -version |
146 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version |
145 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ |
147 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ |
146 |
148 |
147 # Help target |
149 # Help target |
148 define helpenvline |
150 define helpenvline |
149 @echo " $1";echo " $2" |
151 @echo " $1";echo " $2" |