1.1 --- a/make/defs.make Fri Apr 04 10:48:43 2008 -0400
1.2 +++ b/make/defs.make Wed Apr 09 14:22:48 2008 -0400
1.3 @@ -57,6 +57,7 @@
1.4 # When the tree of subdirs is built, this setting is stored in each flags.make.
1.5 GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
1.6 HS_SRC_DIR=$(GAMMADIR)/src
1.7 +HS_MAKE_DIR=$(GAMMADIR)/make
1.8 HS_BUILD_DIR=$(GAMMADIR)/build
1.9
1.10 ifeq ($(USER),)
1.11 @@ -170,17 +171,17 @@
1.12
1.13 # The platform dependent defs.make defines platform specific variable such
1.14 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
1.15 -include $(GAMMADIR)/build/$(OSNAME)/makefiles/defs.make
1.16 +include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
1.17
1.18 # We are trying to put platform specific defintions
1.19 -# files to build/$(OSNAME)/makefiles dictory. However
1.20 +# files to make/$(OSNAME)/makefiles dictory. However
1.21 # some definitions are common for both linux and solaris,
1.22 # so we put them here.
1.23 ifneq ($(OSNAME),windows)
1.24 - ABS_OUTPUTDIR := $(shell $(CD) $(OUTPUTDIR); $(PWD))
1.25 + ABS_OUTPUTDIR := $(shell mkdir -p $(OUTPUTDIR); $(CD) $(OUTPUTDIR); $(PWD))
1.26 ABS_BOOTDIR := $(shell $(CD) $(BOOTDIR); $(PWD))
1.27 ABS_GAMMADIR := $(shell $(CD) $(GAMMADIR); $(PWD))
1.28 - ABS_OS_MAKEFILE := $(shell $(CD) $(HS_BUILD_DIR)/$(OSNAME); $(PWD))/Makefile
1.29 + ABS_OS_MAKEFILE := $(shell $(CD) $(HS_MAKE_DIR)/$(OSNAME); $(PWD))/Makefile
1.30
1.31 # uname, HotSpot source directory, build directory and JDK use different names
1.32 # for CPU architectures.
