changeset 1908:ac7b942245f2

Merge
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 21 Jan 2010 02:04:50 +0000
parents bd1235460fae (current diff) daf81eeba901 (diff)
children 30881dc8076c
files ChangeLog Makefile.am
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 21 01:57:01 2010 +0000
+++ b/ChangeLog	Thu Jan 21 02:04:50 2010 +0000
@@ -16,6 +16,13 @@
 	Updated to include DERIVATIVE_ID (IcedTea6 version)
 	in the crash dump output.
 
+2010-01-20  Xerxes RĂ„nby  <xerxes@zafena.se>
+
+	PR icedtea/431:
+	* Makefile.am:
+	Create a link from client to server after CACAO install
+	to make openjdk find the expected client dir on 32bit systems.
+
 2010-01-19 Man Lung Wong  <mwong@redhat.com>
 
 	* rt/net/sourceforge/jnlp/JNLPFile.java
--- a/Makefile.am	Thu Jan 21 01:57:01 2010 +0000
+++ b/Makefile.am	Thu Jan 21 02:04:50 2010 +0000
@@ -1844,6 +1844,7 @@
 	  --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \
 	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
 	$(ARCH_PREFIX) $(MAKE) install
+	ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
 endif
 endif
 	mkdir -p stamps