From 9c0c73358def6719182c5963db3fa9ec62708ffe Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Sat, 20 Aug 2011 00:31:12 +0000
Subject: [PATCH] Add non-x86 target for Linux.

Move the arm and ppc archs for linux from the preppkg target to the non-x86
target.

Make the linux target depend on the x86 and non-x86 targets.
---
 build.xml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 5800c5864..3137d7696 100644
--- a/build.xml
+++ b/build.xml
@@ -552,15 +552,6 @@
         <copy todir="pkg-temp/lib/wrapper/solaris/">
             <fileset dir="installer/lib/wrapper/solaris/" />
         </copy>
-        <copy todir="pkg-temp/lib/wrapper/linux-armv7/">
-            <fileset dir="installer/lib/wrapper/linux-armv7/" />
-        </copy>
-	<copy todir="pkg-temp/lib/wrapper/linux-ppc/">
-	    <fileset dir="installer/lib/wrapper/linux-ppc/" />
-	</copy>
-        <copy todir="pkg-temp/lib/wrapper/linux-armv5/">
-            <fileset dir="installer/lib/wrapper/linux-armv5/" />
-        </copy>
     </target>
 
     <target name="preppkg-freebsd" depends="preppkg-unix">
@@ -595,8 +586,9 @@
         </copy>
     </target>
 
-    <!-- x86 linux only -->
-    <target name="preppkg-linux" depends="preppkg-unix">
+    <target name="preppkg-linux" depends="preppkg-linux-x86,preppkg-linux-nonx86" />
+
+    <target name="preppkg-linux-x86" depends="preppkg-unix">
         <copy todir="pkg-temp/lib/wrapper/linux/">
             <fileset dir="installer/lib/wrapper/linux/" />
         </copy>
@@ -605,6 +597,18 @@
         </copy>
     </target>
 
+    <target name="preppkg-linux-nonx86" depends="preppkg-unix">
+        <copy todir="pkg-temp/lib/wrapper/linux-armv7/">
+            <fileset dir="installer/lib/wrapper/linux-armv7/" />
+        </copy>
+	<copy todir="pkg-temp/lib/wrapper/linux-ppc/">
+	    <fileset dir="installer/lib/wrapper/linux-ppc/" />
+	</copy>
+        <copy todir="pkg-temp/lib/wrapper/linux-armv5/">
+            <fileset dir="installer/lib/wrapper/linux-armv5/" />
+        </copy>
+    </target>
+
     <target name="preppkg-osx" depends="preppkg-unix">
         <!--<copy file="installer/resources/I2P Router Console.webloc" todir="pkg-temp/" />-->
         <copy todir="pkg-temp/Start I2P Router.app">