1.1 --- a/Makefile Sun Mar 09 13:11:51 2008 -0700 1.2 +++ b/Makefile Sun Mar 09 15:47:58 2008 -0700 1.3 @@ -23,6 +23,8 @@ 1.4 # have any questions. 1.5 # 1.6 1.7 +BUILD_PARENT_DIRECTORY=. 1.8 + 1.9 ifndef TOPDIR 1.10 TOPDIR:=$(shell \ 1.11 if [ -r ./j2se/make/Makefile -o -r ./jdk/make/Makefile ]; then \ 1.12 @@ -66,6 +68,7 @@ 1.13 1.14 all:: 1.15 @$(ECHO) $(PLATFORM) $(ARCH) $(RELEASE) build started: `$(DATE) '+%y-%m-%d %H:%M'` 1.16 + $(MKDIR) -p $(OUTPUTDIR) 1.17 1.18 # Rules for sanity checks 1.19 include ./make/sanity-rules.gmk 1.20 @@ -94,12 +97,9 @@ 1.21 1.22 setup: openjdk_check 1.23 $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image 1.24 - $(MKDIR) -p $(ABS_OUTPUTDIR)/j2sdk-image 1.25 - $(MKDIR) -p $(OUTPUTDIR)-fastdebug/j2sdk-image 1.26 - $(MKDIR) -p $(ABS_OUTPUTDIR)-fastdebug/j2sdk-image 1.27 1.28 # Check on whether we really can build the openjdk, need source etc. 1.29 -openjdk_check: 1.30 +openjdk_check: FRC 1.31 ifneq ($(SKIP_OPENJDK_BUILD), true) 1.32 @$(ECHO) " " 1.33 @$(ECHO) "=================================================" 1.34 @@ -170,7 +170,7 @@ 1.35 1.36 COMMON_DEBUG_FLAGS= \ 1.37 DEBUG_NAME=$(DEBUG_NAME) \ 1.38 - ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME) \ 1.39 + ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ 1.40 NO_DOCS=true 1.41 1.42 product_build: setup 1.43 @@ -501,3 +501,6 @@ 1.44 j2se_fastdebug_only: jdk_fastdebug_only 1.45 j2se_only: jdk_only 1.46 1.47 +# Force target 1.48 +FRC: 1.49 +