summarylogtreecommitdiffstats
path: root/rinclude.patch
blob: dc65b6e90d76494d3f0af588ea76c7301f0c8c00 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
diff --git a/engine/Makefile.in b/engine/Makefile.in
@@ -52,11 +52,11 @@
 	CXXFLAGS += -mmacosx-version-min=10.10
 else
 ifeq ($(os),Linux)
-	R_HOME ?= $(SRCDIR)/../../../lib/R
+	R_HOME ?= /usr/lib/R
 	BASE_MODULE_PATH ?= $(SRCDIR)/../../modules/base/R
 	R_PATH ?= $$ORIGIN/../lib  $$ORIGIN/../Resources/modules/base/R/RInside/lib
 	LDFLAGS +=	-L$(R_HOME)/lib \
-				-L$(BASE_MODULE_PATH)/RInside/lib \
+				-L$(R_HOME)/library/RInside/lib \
 				-lboost_filesystem \
 				-lboost_system \
 				-lpthread \
@@ -84,6 +84,7 @@
 	-I$(SRCDIR)/../../../include \
 	-I$(SRCDIR)/../server/jamovi/common \
 	-I$(R_HOME)/include \
+	-I /usr/include/R \
 	-I$(BASE_MODULE_PATH)/RInside/include \
 	-I$(BASE_MODULE_PATH)/Rcpp/include \
 	-I/usr/share/R/include