diff options
Diffstat (limited to 'rinclude.patch')
| -rw-r--r-- | rinclude.patch | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/rinclude.patch b/rinclude.patch index e64bbc709957..0a00c5e822f6 100644 --- a/rinclude.patch +++ b/rinclude.patch @@ -1,28 +1,15 @@ diff --git a/engine/Makefile b/engine/Makefile -index da42f79..83fd006 100644 +index 040936b..741fce2 100644 --- a/engine/Makefile +++ b/engine/Makefile -@@ -36,7 +36,7 @@ else +@@ -36,8 +36,8 @@ ifeq ($(os),OSX) + else ifeq ($(os),Linux) R_HOME = /usr/lib/R - INCLUDES += -I/usr/share/R/include -- LIBS = -L$(R_HOME)/library/RInside/lib -L$(R_HOME)/site-library/RInside/lib \ -+ LIBS = -L$(R_HOME)/library/RInside/lib -L$(R_HOME)/site-library/RInside/lib -L$(R_HOME)/lib \ +- INCLUDES += -I/usr/share/R/include +- LIBS = -L$(SRCDIR)/../../modules/base/R/RInside/lib \ ++ INCLUDES += -I/usr/share/R/include -I/usr/include/R ++ LIBS = -L$(SRCDIR)/../../modules/base/R/RInside/lib -L$(R_HOME)/lib -L$(R_HOME)/library/RInside/lib \ -lboost_filesystem \ -lboost_system \ -lpthread \ -@@ -53,12 +53,13 @@ endif - endif - - INCLUDES += \ -+ -I/usr/include/R \ - -I$(SRCDIR)/../../include \ - -I$(SRCDIR)/../../../include \ - -I$(SRCDIR)/../server/jamovi/common \ - -I$(R_HOME)/include \ - -I$(R_HOME)/library/RInside/include -I$(R_HOME)/site-library/RInside/include \ -- -I$(R_HOME)/library/Rcpp/include -I$(R_HOME)/site-library/Rcpp/include -+ -I$(R_HOME)/library/Rcpp/include -I$(R_HOME)/site-library/Rcpp/include - - LIBS += -lR -lnanomsg -lprotobuf -lRInside - |