changeset in /hg/icedtea: 2008-03-28 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 07a26d70e24f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=07a26d70e24f
description:
	2008-03-28  Gary Benson  <gbenson at redhat.com>

		* Makefile.am
		(stamps/ports.stamp, stamps/ports-ecj.stamp): Fixed broken core
		and zero detection.
		* Makefile.in: Regenerated.

diffstat:

3 files changed, 16 insertions(+), 8 deletions(-)
ChangeLog   |    8 ++++++++
Makefile.am |    8 ++++----
Makefile.in |    8 ++++----

diffs (84 lines):

diff -r 875f25aaaac9 -r 07a26d70e24f ChangeLog
--- a/ChangeLog	Thu Mar 27 11:35:01 2008 -0400
+++ b/ChangeLog	Fri Mar 28 04:43:32 2008 -0400
@@ -1,3 +1,10 @@ 2008-03-27  Lillian Angel  <langel at redha
+2008-03-28  Gary Benson  <gbenson at redhat.com>
+
+	* Makefile.am
+	(stamps/ports.stamp, stamps/ports-ecj.stamp): Fixed broken core
+	and zero detection.
+	* Makefile.in: Regenerated.
+
 2008-03-27  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Updated to OpenJDK b08 release.
@@ -19,6 +26,7 @@ 2008-03-27  Gary Benson  <gbenson at redhat
 	* Makefile.am
 	(stamps/ports.stamp, stamps/ports-ecj.stamp): Fixed broken cacao
 	detection.
+	* Makefile.in: Regenerated.
 
 2008-03-26  Gary Benson  <gbenson at redhat.com>
 
diff -r 875f25aaaac9 -r 07a26d70e24f Makefile.am
--- a/Makefile.am	Thu Mar 27 11:35:01 2008 -0400
+++ b/Makefile.am	Fri Mar 28 04:43:32 2008 -0400
@@ -199,11 +199,11 @@ stamps/ports.stamp: stamps/extract.stamp
 	  ln -sf $$PWD/$$target $$link; \
 	done
 	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
-	if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \
+	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
-	if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \
+	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
 	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
@@ -363,11 +363,11 @@ stamps/ports-ecj.stamp: stamps/extract-e
 	  ln -sf $$PWD/$$target $$link; \
 	done
 	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
-	if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \
+	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
-	if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \
+	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
 	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
diff -r 875f25aaaac9 -r 07a26d70e24f Makefile.in
--- a/Makefile.in	Thu Mar 27 11:35:01 2008 -0400
+++ b/Makefile.in	Fri Mar 28 04:43:32 2008 -0400
@@ -776,11 +776,11 @@ stamps/ports.stamp: stamps/extract.stamp
 	  ln -sf $$PWD/$$target $$link; \
 	done
 	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
-	if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \
+	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
-	if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \
+	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
 	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
@@ -862,11 +862,11 @@ stamps/ports-ecj.stamp: stamps/extract-e
 	  ln -sf $$PWD/$$target $$link; \
 	done
 	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
-	if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \
+	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
-	if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \
+	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
 	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps