1.1 --- a/Makefile Tue Mar 18 11:01:40 2008 -0700
1.2 +++ b/Makefile Tue Mar 25 14:38:56 2008 -0700
1.3 @@ -26,30 +26,17 @@
1.4 BUILD_PARENT_DIRECTORY=.
1.5
1.6 ifndef TOPDIR
1.7 - TOPDIR:=$(shell \
1.8 - if [ -r ./j2se/make/Makefile -o -r ./jdk/make/Makefile ]; then \
1.9 - echo "."; \
1.10 - else \
1.11 - echo "../.."; \
1.12 - fi)
1.13 + TOPDIR:=.
1.14 endif
1.15
1.16 ifndef CONTROL_TOPDIR
1.17 - CONTROL_TOPDIR=$(TOPDIR)/control
1.18 - CONTROL_TOPDIR:=$(shell \
1.19 - if [ -r $(TOPDIR)/control/make/Makefile ]; then \
1.20 - echo "$(TOPDIR)/control"; \
1.21 - else \
1.22 - echo "$(TOPDIR)"; \
1.23 - fi)
1.24 + CONTROL_TOPDIR=$(TOPDIR)
1.25 endif
1.26
1.27 # Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true)
1.28 OPENJDK_SOURCETREE=$(TOPDIR)/openjdk
1.29 OPENJDK_BUILDDIR:=$(shell \
1.30 - if [ -r $(OPENJDK_SOURCETREE)/control/make/Makefile ]; then \
1.31 - echo "$(OPENJDK_SOURCETREE)/control/make"; \
1.32 - elif [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \
1.33 + if [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \
1.34 echo "$(OPENJDK_SOURCETREE)"; \
1.35 else \
1.36 echo "."; \
1.37 @@ -497,10 +484,6 @@
1.38 fastdebug_build debug_build product_build setup \
1.39 dev dev-build dev-sanity dev-clobber
1.40
1.41 -# FIXUP: Old j2se targets
1.42 -j2se_fastdebug_only: jdk_fastdebug_only
1.43 -j2se_only: jdk_only
1.44 -
1.45 # Force target
1.46 FRC:
1.47
