1.1 --- a/make/Makefile Tue Jul 09 14:28:07 2013 +0200
1.2 +++ b/make/Makefile Wed Jul 10 09:14:25 2013 -0700
1.3 @@ -177,7 +177,7 @@
1.4
1.5 $(CORE_VM_TARGETS):
1.6 $(CD) $(GAMMADIR)/make; \
1.7 - $(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:$core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
1.8 + $(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:%core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
1.9
1.10 $(ZERO_VM_TARGETS):
1.11 $(CD) $(GAMMADIR)/make; \
1.12 @@ -478,22 +478,22 @@
1.13 # Core
1.14 ifeq ($(JVM_VARIANT_CORE), true)
1.15 # Common
1.16 -$(EXPORT_LIB_DIR)/%.jar: $(CORE_DIR)/../generated/%.jar
1.17 +$(EXPORT_LIB_DIR)/%.jar: $(CORE_BUILD_DIR)/../generated/%.jar
1.18 $(install-file)
1.19 -$(EXPORT_INCLUDE_DIR)/%: $(CORE_DIR)/../generated/jvmtifiles/%
1.20 +$(EXPORT_INCLUDE_DIR)/%: $(CORE_BUILD_DIR)/../generated/jvmtifiles/%
1.21 $(install-file)
1.22 # Unix
1.23 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX)
1.24 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.25 $(install-file)
1.26 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo
1.27 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_BUILD_DIR)/%.debuginfo
1.28 $(install-file)
1.29 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_DIR)/%.diz
1.30 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_BUILD_DIR)/%.diz
1.31 $(install-file)
1.32 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX)
1.33 +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.34 $(install-file)
1.35 -$(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo
1.36 +$(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_BUILD_DIR)/%.debuginfo
1.37 $(install-file)
1.38 -$(EXPORT_SERVER_DIR)/%.diz: $(CORE_DIR)/%.diz
1.39 +$(EXPORT_SERVER_DIR)/%.diz: $(CORE_BUILD_DIR)/%.diz
1.40 $(install-file)
1.41 endif
1.42
