From c6d1baa27514f9960159f7432cd64406f596a267 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <mellis@mellis-laptop.(none)>
Date: Sat, 27 Nov 2010 19:50:33 +0100
Subject: [PATCH 1/2] Fixing up some Linux stuff.

---
 build/build.xml          | 2 +-
 build/linux/dist/arduino | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 4fa426eed..43433a5bb 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -314,7 +314,7 @@
   
   <target name="linux-run" depends="linux-build" 
 	  description="Run Linux version">
-    <exec executable="./arduino" dir="linux/work" spawn="false"/>
+    <exec executable="./linux/work/arduino" spawn="false"/>
   </target>
   
   <target name="linux-dist" depends="linux-build" 
diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index 7128bacfa..a2bc2c287 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -10,11 +10,11 @@ for LIB in \
     lib/*.jar \
     ;
 do
-    CLASSPATH="${CLASSPATH}:${APPDIR}/${LIB}"
+    CLASSPATH="${CLASSPATH}:${LIB}"
 done
 export CLASSPATH
 
-LD_LIBRARY_PATH=`pwd`/lib:${LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=`pwd`/lib:/usr/lib/jni${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 export PATH="${APPDIR}/java/bin:${PATH}"

From a00c0da97ddf5af41e3bcb07910112a90dc2b82b Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <mellis@mellis-laptop.(none)>
Date: Sat, 27 Nov 2010 23:57:02 +0100
Subject: [PATCH 2/2] Removing /usr/lib/jni from LD_LIBRARY_PATH since that's
 not where RXTX is on my Ubuntu 10.04 system.

---
 build/linux/dist/arduino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index a2bc2c287..adce6b7fa 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -14,7 +14,7 @@ do
 done
 export CLASSPATH
 
-LD_LIBRARY_PATH=`pwd`/lib:/usr/lib/jni${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 export PATH="${APPDIR}/java/bin:${PATH}"