changeset in /hg/icedtea6: 2009-05-05 Lillian Angel <langel at re...

[Lillian Angel]

changeset 50da1d3efe60 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=50da1d3efe60
description:
	2009-05-05  Lillian Angel  <langel at redhat.com>

	        Fixes BZ#313
	        * Makefile.am
	        (hotspot): Fixes paths and creates server directory before copy.

diffstat:

2 files changed, 10 insertions(+), 2 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |    6 ++++--

diffs (35 lines):

diff -r 3fc3144c4fef -r 50da1d3efe60 ChangeLog
--- a/ChangeLog	Tue May 05 16:57:03 2009 +0200
+++ b/ChangeLog	Tue May 05 11:26:38 2009 -0400
@@ -1,3 +1,9 @@ 2009-05-05  Matthias Klose  <doko at ubuntu
+2009-05-05  Lillian Angel  <langel at redhat.com>
+
+	Fixes BZ#313
+	* Makefile.am
+	(hotspot): Fixes paths and creates server directory before copy.
+
 2009-05-05  Matthias Klose  <doko at ubuntu.com>
 
 	* configure.ac: Building --with-additional-vms=zero and
diff -r 3fc3144c4fef -r 50da1d3efe60 Makefile.am
--- a/Makefile.am	Tue May 05 16:57:03 2009 +0200
+++ b/Makefile.am	Tue May 05 11:26:38 2009 -0400
@@ -1328,14 +1328,16 @@ stamps/icedtea-ecj.stamp: stamps/bootstr
 	mkdir -p stamps
 	touch stamps/icedtea-ecj.stamp
 
-SERVER_DIR = hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/server
+SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
 hotspot:
 	rm -f stamps/bootstrap-directory-symlink-ecj.stamp
 	rm -f stamps/icedtea-ecj.stamp
 	rm -f stamps/icedtea-against-ecj.stamp
 	$(ARCH_PREFIX) $(MAKE) hotspot-helper
+	mkdir -p \
+	   $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
 	cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
-	   $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/server
+	   $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
 	@echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
 
 hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \