# HG changeset patch
# User Lillian Angel <langel@redhat.com>
# Date 1241537198 14400
# Node ID 9b23521876697a9cf61fe309b72fb542535b7a3c
# Parent  a0a5d904139dc67f1cd30fd9b2696bfc5a7bb747
2009-05-05  Lillian Angel  <langel@redhat.com>

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

diff -r a0a5d904139d -r 9b2352187669 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  Lillian Angel  <langel@redhat.com>
+
+	Fixes BZ#313
+	* Makefile.am
+	(hotspot): Fixes paths and creates server directory before copy.
+
 2009-05-05  Matthias Klose  <doko@ubuntu.com>
 
 	* configure.ac: Building --with-additional-vms=zero and
diff -r a0a5d904139d -r 9b2352187669 Makefile.am
--- a/Makefile.am	Tue May 05 16:57:03 2009 +0200
+++ b/Makefile.am	Tue May 05 11:26:38 2009 -0400
@@ -2757,14 +2757,16 @@
 	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 \