1.1 --- a/common/autoconf/spec.gmk.in Wed Jan 02 15:36:00 2013 +0100
1.2 +++ b/common/autoconf/spec.gmk.in Thu Jan 03 20:54:38 2013 +0100
1.3 @@ -618,5 +618,21 @@
1.4 OS_VERSION_MINOR:=@OS_VERSION_MINOR@
1.5 OS_VERSION_MICRO:=@OS_VERSION_MICRO@
1.6
1.7 +# Images directory definitions
1.8 +JDK_IMAGE_SUBDIR:=j2sdk-image
1.9 +JRE_IMAGE_SUBDIR:=j2re-image
1.10 +JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image
1.11 +JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image
1.12 +JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
1.13 +JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
1.14 +JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR)
1.15 +JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR)
1.16 +
1.17 +# Macosx bundles directory definitions
1.18 +JDK_BUNDLE_SUBDIR:=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
1.19 +JRE_BUNDLE_SUBDIR:=j2re-bundle/jre$(JDK_VERSION).jre/Contents
1.20 +JDK_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR)
1.21 +JRE_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
1.22 +
1.23 # Include the custom-spec.gmk file if it exists
1.24 -include $(dir @SPEC@)/custom-spec.gmk
