From 63236b03f45355aa61dfc0b385d104bbed5032f3 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 11 Sep 2011 06:32:28 +0200
Subject: New FHS: jars in jar/

---
 build.xml |  1 +
 jocl.jnlp | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index aea727e9..a515d521 100644
--- a/build.xml
+++ b/build.xml
@@ -281,6 +281,7 @@
             <filterchain>
                 <replacestring from="JOCL_CODEBASE_TAG"     to="${jocl.jnlp.codebase}"/>
                 <replacestring from="GLUEGEN_CODEBASE_TAG"  to="${gluegen.jnlp.codebase}"/>
+                <replacestring from="jar/jocl"              to="jocl"/>
             </filterchain>
         </copy>
         
diff --git a/jocl.jnlp b/jocl.jnlp
index 2450b2b3..7d82ff73 100644
--- a/jocl.jnlp
+++ b/jocl.jnlp
@@ -13,50 +13,50 @@
         <all-permissions/>
     </security>
     <resources>
-        <jar href="jocl.jar" />
+        <jar href="jar/jocl.jar" />
         <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
     <resources os="Windows" arch="x86">
-        <nativelib href = "jocl-natives-windows-i586.jar" />
+        <nativelib href = "jar/jocl-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-        <nativelib href = "jocl-natives-windows-amd64.jar" />
+        <nativelib href = "jar/jocl-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-        <nativelib href = "jocl-natives-windows-amd64.jar" />
+        <nativelib href = "jar/jocl-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-        <nativelib href = "jocl-natives-solaris-sparc.jar" />
+        <nativelib href = "jar/jocl-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-        <nativelib href = "jocl-natives-solaris-sparcv9.jar" />
+        <nativelib href = "jar/jocl-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-        <nativelib href = "jocl-natives-solaris-i586.jar" />
+        <nativelib href = "jar/jocl-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-        <nativelib href = "jocl-natives-solaris-amd64.jar" />
+        <nativelib href = "jar/jocl-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-        <nativelib href = "jocl-natives-solaris-amd64.jar" />
+        <nativelib href = "jar/jocl-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-        <nativelib href = "jocl-natives-linux-i586.jar" />
+        <nativelib href = "jar/jocl-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-        <nativelib href = "jocl-natives-linux-i586.jar" />
+        <nativelib href = "jar/jocl-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-        <nativelib href = "jocl-natives-linux-amd64.jar" />
+        <nativelib href = "jar/jocl-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-        <nativelib href = "jocl-natives-linux-amd64.jar" />
+        <nativelib href = "jar/jocl-natives-linux-amd64.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-        <nativelib href = "jocl-natives-macosx-universal.jar" />
+        <nativelib href = "jar/jocl-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-        <nativelib href = "jocl-natives-macosx-universal.jar" />
+        <nativelib href = "jar/jocl-natives-macosx-universal.jar" />
     </resources>
     <component-desc />
 </jnlp>
-- 
cgit v1.2.3