# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1254156411 -7200
# Node ID d4be90e180f75d33b0503925ac9a54aaac30f1a7
# Parent  08a89bfa38901896512bade30e41e11aba8e257e
java-j*: add link targets

diff -r 08a89bfa3890 -r d4be90e180f7 icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Mon Sep 28 17:02:43 2009 +0200
+++ b/icedtea6-jdk/receipt	Mon Sep 28 18:46:51 2009 +0200
@@ -31,7 +31,7 @@
 	cat > slitaz.sh <<EOT
 # Busybox compatibility
 find -name Sanity.gmk | xargs sed -i 's/--sync -kP/-k/' Makefile 
-find -name Platform.gmk | xargs sed -i 's@MB_OF_MEMORY :=.*@MB_OF_MEMORY := \$(shell free | awk '"'"'/Mem:/ { printf "%d\\\\n",\$2/1024 }'"'"')@' Makefile
+find -name Platform.gmk | xargs sed -i 's@MB_OF_MEMORY :=.*@MB_OF_MEMORY := \$(shell free | awk '"'"'/Mem:/ { printf "%d\\\\n",\\\$2/1024 }'"'"')@' Makefile
 EOT
 	sed -i  -e 's|touch stamps/extract.stamp|&\n\tsh slitaz.sh|' \
 		-e 's|touch stamps/download.stamp|&\n\tsh slitaz.sh|' \
diff -r 08a89bfa3890 -r d4be90e180f7 java-jdk/receipt
--- a/java-jdk/receipt	Mon Sep 28 17:02:43 2009 +0200
+++ b/java-jdk/receipt	Mon Sep 28 18:46:51 2009 +0200
@@ -17,6 +17,16 @@
 	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
 	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 
-	mkdir -p $fs/usr/bin
+	mkdir -p $fs/usr/bin $fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli
+	cp -a $_pkg/usr/lib/jvm/java-icedtea/jre/lib/i386/jli/libjli.so \
+		$fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli
 	cp -a $_pkg/usr/jdk-bin/* $fs/usr/bin
+	for i in $_pkg/usr/jdk-bin/* ; do
+		while [ -L $i ]; do
+			target=$(readlink $i)
+			mkdir -p $fs$(dirname $target)
+			cp -a $_pkg$target $fs$target
+			i=$_pkg$target
+		done
+	done
 }
diff -r 08a89bfa3890 -r d4be90e180f7 java-jre/receipt
--- a/java-jre/receipt	Mon Sep 28 17:02:43 2009 +0200
+++ b/java-jre/receipt	Mon Sep 28 18:46:51 2009 +0200
@@ -17,6 +17,16 @@
 	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
 	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 
-	mkdir -p $fs/usr/bin
+	mkdir -p $fs/usr/bin $fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli
+	cp -a $_pkg/usr/lib/jvm/java-icedtea/jre/lib/i386/jli/libjli.so \
+		$fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli
 	cp -a $_pkg/usr/jre-bin/* $fs/usr/bin
+	for i in $_pkg/usr/jre-bin/* ; do
+		while [ -L $i ]; do
+			target=$(readlink $i)
+			mkdir -p $fs$(dirname $target)
+			cp -a $_pkg$target $fs$target
+			i=$_pkg$target
+		done
+	done
 }