1.1 --- a/common/autoconf/spec.gmk.in Tue Apr 02 15:29:18 2013 -0700
1.2 +++ b/common/autoconf/spec.gmk.in Thu Apr 04 09:24:21 2013 +0200
1.3 @@ -225,6 +225,7 @@
1.4 # directory.
1.5
1.6 BUILD_OUTPUT:=@BUILD_OUTPUT@
1.7 +# Colon left out to be able to override IMAGES_OUTPUTDIR for bootcycle-images
1.8 LANGTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/langtools
1.9 CORBA_OUTPUTDIR=$(BUILD_OUTPUT)/corba
1.10 JAXP_OUTPUTDIR=$(BUILD_OUTPUT)/jaxp
1.11 @@ -643,16 +644,17 @@
1.12 JRE_IMAGE_SUBDIR:=j2re-image
1.13 JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image
1.14 JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image
1.15 -JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
1.16 -JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
1.17 -JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR)
1.18 -JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR)
1.19 +# Colon left out to be able to override output dir for bootcycle-images
1.20 +JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
1.21 +JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
1.22 +JDK_OVERLAY_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR)
1.23 +JRE_OVERLAY_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR)
1.24
1.25 # Macosx bundles directory definitions
1.26 -JDK_BUNDLE_SUBDIR:=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
1.27 -JRE_BUNDLE_SUBDIR:=j2re-bundle/jre$(JDK_VERSION).jre/Contents
1.28 -JDK_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR)
1.29 -JRE_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
1.30 +JDK_BUNDLE_SUBDIR=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
1.31 +JRE_BUNDLE_SUBDIR=j2re-bundle/jre$(JDK_VERSION).jre/Contents
1.32 +JDK_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR)
1.33 +JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
1.34
1.35 # Include the custom-spec.gmk file if it exists
1.36 -include $(dir @SPEC@)/custom-spec.gmk
