comparison common/autoconf/spec.gmk.in @ 562:befbad2e4d87

8005635: build-infra: Support building install in jprt Reviewed-by: ohair Contributed-by: tim.bell@oracle.com, erik.joelsson@oracle.com
author erikj
date Thu, 03 Jan 2013 20:54:38 +0100
parents 348a881c6da0
children 12782ec1da5f 3dc55f0c1b6f
comparison
equal deleted inserted replaced
11:23b159063e7b 12:3d0c07c8c67b
616 616
617 OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@ 617 OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
618 OS_VERSION_MINOR:=@OS_VERSION_MINOR@ 618 OS_VERSION_MINOR:=@OS_VERSION_MINOR@
619 OS_VERSION_MICRO:=@OS_VERSION_MICRO@ 619 OS_VERSION_MICRO:=@OS_VERSION_MICRO@
620 620
621 # Images directory definitions
622 JDK_IMAGE_SUBDIR:=j2sdk-image
623 JRE_IMAGE_SUBDIR:=j2re-image
624 JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image
625 JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image
626 JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
627 JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
628 JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR)
629 JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR)
630
631 # Macosx bundles directory definitions
632 JDK_BUNDLE_SUBDIR:=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
633 JRE_BUNDLE_SUBDIR:=j2re-bundle/jre$(JDK_VERSION).jre/Contents
634 JDK_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR)
635 JRE_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
636
621 # Include the custom-spec.gmk file if it exists 637 # Include the custom-spec.gmk file if it exists
622 -include $(dir @SPEC@)/custom-spec.gmk 638 -include $(dir @SPEC@)/custom-spec.gmk