app lib should be taken into account for flatpak

jasp-stats · Jun 20, 2018 · 9829e78 · 9829e78
1 parent 13b4530
commit 9829e78
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/R_HOME.pri b/R_HOME.pri
@@ -3,13 +3,18 @@ LINUX_SPECIAL_CASE = false
 _R_HOME = $$(R_HOME)
 
 linux {
-    $$LINUX_SPECIAL_CASE | exists(/app/lib/*) {
-        _R_HOME = /usr/lib64/R
-        INCLUDEPATH += /usr/lib64/R/library/include
+	exists(/app/lib/*) {
+        _R_HOME = /app/lib64/R
+        INCLUDEPATH += /app/lib64/R/library/include
     } else {
-        _R_HOME = /usr/lib/R
-        INCLUDEPATH += /usr/lib/R/library/include
-    }
+		$$LINUX_SPECIAL_CASE {
+			_R_HOME = /usr/lib64/R
+			INCLUDEPATH += /usr/lib64/R/library/include
+		} else {
+			_R_HOME = /usr/lib/R
+			INCLUDEPATH += /usr/lib/R/library/include
+		}
+	}
 
     QMAKE_CXXFLAGS += -D\'R_HOME=\"$$_R_HOME\"\'
     INCLUDEPATH += /usr/include/R/