--- a/ChangeLog	Fri Jun 04 14:20:15 2010 -0400
+++ b/ChangeLog	Fri Jun 11 13:26:35 2010 +0100
@@ -1,3 +1,22 @@
+2010-06-07 Andrew John Hughes  <ahughes@redhat.com>
+
+	Make BOOT_BUILD_OUTPUT_DIR absolute and dispense
+	with ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ.
+	* Makefile.am:
+	(ICEDTEA_BUILD_DIR): Dropped.
+	(ECJ_BUILD_OUTPUT_DIR): Make absolute.
+	(ICEDTEA_CLS_DIR_BOOT): Make relative to ECJ_BUILD_OUTPUT_DIR.
+	(ICEDTEA_BUILD_DIR_BOOT): Dropped.
+	(bootstrap-directory.stamp): Use BOOT_BUILD_OUTPUT_DIR
+	rather than ICEDTEA_BUILD_DIR_BOOT.  Remove unneeded
+	$(abs_top_builddir).
+	(icedtea-debug.stamp): Add pulse java src.zip update.
+	(ADD_ZERO_EXTRA_BUILD_ENV): Replace ICEDTEA_BUILD_DIR
+	with BUILD_OUTPUT_DIR.
+	(check-hotspot): Replace unneeded use of pwd.
+	(check-jdk): Likewise.
+	(check-langtools): Likewise.
+
 2010-06-04 Jon VanAlten  <jon.vanalten@redhat.com>
 
 	PR icedtea/438

--- a/Makefile.am	Fri Jun 04 14:20:15 2010 -0400
+++ b/Makefile.am	Fri Jun 11 13:26:35 2010 +0100
@@ -62,25 +62,14 @@
 OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR)
 DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
-BOOT_BUILD_OUTPUT_DIR = openjdk-boot/build/$(OS_DIR)
-ICEDTEA_BUILD_DIR = \
-	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
-ICEDTEA_BOOT_DIR= \
-	$(abs_top_builddir)/bootstrap/jdk1.6.0
-ICEDTEA_RT = \
-	$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar
-NETX_CLASSES = \
-	$(abs_top_builddir)/netx.build
-NETX_JAR = \
-	$(NETX_CLASSES)/lib/classes.jar
-NETX_SRC = \
-	$(NETX_CLASSES)/lib/src.zip
-ICEDTEA_ENDORSED_DIR = \
-	$(ICEDTEA_BOOT_DIR)/lib/endorsed
-ICEDTEA_BUILD_DIR_BOOT = \
-	$(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/
-ICEDTEA_CLS_DIR_BOOT = \
-	$(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/classes
+BOOT_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-boot/build/$(OS_DIR)
+ICEDTEA_BOOT_DIR= $(abs_top_builddir)/bootstrap/jdk1.6.0
+ICEDTEA_RT = $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar
+NETX_CLASSES = $(abs_top_builddir)/netx.build
+NETX_JAR = $(NETX_CLASSES)/lib/classes.jar
+NETX_SRC = $(NETX_CLASSES)/lib/src.zip
+ICEDTEA_ENDORSED_DIR = $(ICEDTEA_BOOT_DIR)/lib/endorsed
+ICEDTEA_CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes
 SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
 BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -1741,11 +1730,9 @@
 # bootstrap/stage2.
 stamps/bootstrap-directory-stage2.stamp: stamps/icedtea-stage1.stamp
 	rm -rf bootstrap/icedtea
-	ln -s \
-	  $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ \
-	  bootstrap/icedtea
+	ln -s $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ bootstrap/icedtea
 	if ! test -d bootstrap/icedtea/include; then \
-	  ln -sf $(ICEDTEA_BUILD_DIR_BOOT)/include bootstrap/icedtea/include; \
+	  ln -sf $(BOOT_BUILD_OUTPUT_DIR)/include bootstrap/icedtea/include; \
 	fi
 	mkdir -p stamps
 	touch $@
@@ -1889,6 +1876,8 @@
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
 	cp -pPRf pulse-java.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+	   $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
 endif
 if JNLP_ABOUT_NEEDED
 	cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
@@ -2415,10 +2404,10 @@
 	  $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
-	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \
-	BUILD_JAXP=false      ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \
-	BUILD_JAXWS=false     ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \
-	BUILD_CORBA=false     ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \
+	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \
+	BUILD_JAXP=false      ALT_JAXP_DIST=$(BUILD_OUTPUT_DIR)/jaxp/dist \
+	BUILD_JAXWS=false     ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \
+	BUILD_CORBA=false     ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \
 	BUILD_JDK=false \
 	DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))'
 
@@ -2540,7 +2529,7 @@
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/hotspot/test \
 	    | tee test/$@.log
@@ -2550,7 +2539,7 @@
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
 		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \
 		`pwd`/openjdk/langtools/test \
@@ -2564,7 +2553,7 @@
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
 		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		$(ICEDTEA_JTREG_OPTIONS) $(CACAO_EXCLUDE) \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
 		`pwd`/openjdk/jdk/test \