summaryrefslogtreecommitdiff
blob: 1d7c9335a20f7b0f6042ed51cd65a6bbeb611589 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
diff -Naurp a/build/linux/dist/arduino b/build/linux/dist/arduino
--- a/build/linux/dist/arduino	2015-12-10 02:45:00.010340806 +0100
+++ b/build/linux/dist/arduino	2015-12-10 02:48:13.155420642 +0100
@@ -8,11 +8,12 @@ for LIB in \
     "$APPDIR"/lib/*.jar \
     ;
 do
-    CLASSPATH="${CLASSPATH}:${LIB}"
+    CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
 done
+CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)"
 export CLASSPATH
 
-LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH
 
 export PATH="${APPDIR}/java/bin:${PATH}"