1.1 --- a/make/defs.make Mon Jan 30 23:27:30 2012 -0500
1.2 +++ b/make/defs.make Wed Feb 01 15:01:08 2012 -0500
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -185,6 +185,15 @@
1.11 BOOTDIR=$(ALT_BOOTDIR)
1.12 endif
1.13
1.14 +# Select name of the export directory and honor ALT overrides
1.15 +EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR)
1.16 +ifneq ($(ALT_EXPORT_PATH),)
1.17 + EXPORT_PATH=$(ALT_EXPORT_PATH)
1.18 +endif
1.19 +
1.20 +# Default jdk image if one is created for you with create_jdk
1.21 +JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
1.22 +
1.23 # The platform dependent defs.make defines platform specific variable such
1.24 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
1.25 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
1.26 @@ -263,15 +272,6 @@
1.27 # includes this make/defs.make file.
1.28 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION)
1.29
1.30 -# Select name of export directory
1.31 -EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR)
1.32 -ifneq ($(ALT_EXPORT_PATH),)
1.33 - EXPORT_PATH=$(ALT_EXPORT_PATH)
1.34 -endif
1.35 -
1.36 -# Default jdk image if one is created for you with create_jdk
1.37 -JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
1.38 -
1.39 # Various export sub directories
1.40 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include
1.41 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs
