noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
David A. Mellis 2010-11-28 23:46:37 -05:00
parent 37e6e7e86b a00c0da97d
commit 901319bb7d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build.xml
View File

@ -314,7 +314,7 @@
<target name="linux-run" depends="linux-build" <target name="linux-run" depends="linux-build"
description="Run Linux version"> description="Run Linux version">
<exec executable="./arduino" dir="linux/work" spawn="false"/> <exec executable="./linux/work/arduino" spawn="false"/>
</target> </target>
<target name="linux-dist" depends="linux-build" <target name="linux-dist" depends="linux-build"

4
build/linux/dist/arduino vendored
View File

@ -10,11 +10,11 @@ for LIB in \
lib/*.jar \ lib/*.jar \
; ;
do do
CLASSPATH="${CLASSPATH}:${APPDIR}/${LIB}" CLASSPATH="${CLASSPATH}:${LIB}"
done done
export CLASSPATH 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 LD_LIBRARY_PATH
export PATH="${APPDIR}/java/bin:${PATH}" export PATH="${APPDIR}/java/bin:${PATH}"