/hg/icedtea6: Add missing -debug suffix in icedtea-debug.stamp t...

[andrew at icedtea.classpath.org]

changeset ede5e9311ef4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ede5e9311ef4
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 21 12:38:45 2010 +0000

	Add missing -debug suffix in icedtea-debug.stamp target.

	2010-02-21 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (icedtea-debug.stamp): Add missing
	-debug on end of $(BUILD_OUTPUT_DIR).


diffstat:

2 files changed, 15 insertions(+), 9 deletions(-)
ChangeLog   |    8 +++++++-
Makefile.am |   16 ++++++++--------

diffs (65 lines):

diff -r 40c6a61591e5 -r ede5e9311ef4 ChangeLog
--- a/ChangeLog	Sat Feb 20 21:35:37 2010 +0100
+++ b/ChangeLog	Sun Feb 21 12:38:45 2010 +0000
@@ -1,3 +1,9 @@ 2010-02-20  Matthias Klose  <doko at ubuntu
+2010-02-21 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(icedtea-debug.stamp): Add missing -debug on
+	end of $(BUILD_OUTPUT_DIR).
+
 2010-02-20  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
@@ -803,7 +809,7 @@ 2010-01-04  Andrew John Hughes  <ahughes
 	* Makefile.am:
 	Drop redundant (and broken in some cases)
 	symbolic link.
-	
+
 2009-12-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/ecj/icedtea-jaxp-dependency.patch:
diff -r 40c6a61591e5 -r ede5e9311ef4 Makefile.am
--- a/Makefile.am	Sat Feb 20 21:35:37 2010 +0100
+++ b/Makefile.am	Sun Feb 21 12:38:45 2010 +0000
@@ -1489,31 +1489,31 @@ if WITH_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
 if ENABLE_SYSTEMTAP
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+	mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset ; \
 	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
 	if test $$? -eq 0; then \
 	  sed -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot.stp \
-	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \
 	  sed -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \
 	else \
 	  cp $(abs_top_builddir)/tapset/hotspot.stp \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \
 	fi; \
 	cp $(abs_top_builddir)/tapset/jstack.stp \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/jstack.stp
 endif
 if ENABLE_NSS
 	cp $(abs_top_builddir)/nss.cfg \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security;
 endif
 if WITH_TZDATA_DIR
 	cp $(abs_top_builddir)/tz.properties \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib;
 endif
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug