1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
|
From: Scott Howard <showard@debian.org>
Date: Mon, 16 Dec 2013 14:54:42 -0400
Subject: Look in /usr/lib/jni for libjSSC*.so
---
src/java/jssc/SerialNativeInterface.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/java/jssc/SerialNativeInterface.java b/src/java/jssc/SerialNativeInterface.java
index 37a85d4..50eec84 100644
--- a/src/java/jssc/SerialNativeInterface.java
+++ b/src/java/jssc/SerialNativeInterface.java
@@ -87,7 +87,7 @@ public class SerialNativeInterface {
String tmpFolder = System.getProperty("java.io.tmpdir");
//since 2.3.0 ->
- String libRootFolder = new File(userHome).canWrite() ? userHome : tmpFolder;
+ String libRootFolder = "/usr/lib/jni";
//<- since 2.3.0
String javaLibPath = System.getProperty("java.library.path");//since 2.1.0
@@ -140,8 +140,8 @@ public class SerialNativeInterface {
architecture = "arm" + floatStr;
}
- libFolderPath = libRootFolder + fileSeparator + ".jssc" + fileSeparator + osName;
- libName = "jSSC-" + libVersion + "_" + architecture;
+ libFolderPath = libRootFolder;
+ libName = "jSSC-" + libVersion;
libName = System.mapLibraryName(libName);
if(libName.endsWith(".dylib")){//Since 2.1.0 MacOSX 10.8 fix
|