From 84c7ad1cad0f8e1cc4fecbabb7f22fb2b6400964 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Sat, 22 Oct 2011 11:29:53 +0000
Subject: [PATCH] jre: fix mozilla plugin and linker config paths.

---
 srcpkgs/jre/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template
index 2ab34c24cc2..a71288bae6c 100644
--- a/srcpkgs/jre/template
+++ b/srcpkgs/jre/template
@@ -88,11 +88,19 @@ do_install()
 
 	# Install mozilla compatible plugin.
 	vmkdir		usr/lib/mozilla/plugins
+
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		_arch=amd64
+	else
+		_arch=i386
+	fi
+
 	cd ${DESTDIR}/usr/lib/mozilla/plugins && \
-		ln -sf	../../../../opt/java/jre/lib/amd64/libnpjp2.so .
+		ln -sf	../../../../opt/java/jre/lib/${_arch}/libnpjp2.so .
 
 	# linker's config
         vmkdir etc/ld.so.conf.d
-        echo "/opt/java/jre/lib/amd64" > \
+        echo "/opt/java/jre/lib/${_arch}" > \
                 ${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf
 }