Merge branch 'master' of github.com:arduino/Arduino

damellis · damellis · commit 901319bb7d3a · 2010-11-28T23:46:37.000-05:00
diff --git 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
@@ -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${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 export PATH="${APPDIR}/java/bin:${PATH}"
