Browse code

Call Rscript instead of R in Makevars

This is just for conformance with the "Writing R Extensions" manual
which recommends to use `"${R_HOME}/bin${R_ARCH_BIN}/Rscript"` rather
than `"${R_HOME}/bin/R" --vanilla --slave` for running R code in
Makevars files.

Hervé Pagès authored on 14/07/2020 20:41:22
Showing 2 changed files

... ...
@@ -1,5 +1,5 @@
1 1
 Package: seqbias
2
-Version: 1.37.0
2
+Version: 1.37.1
3 3
 Date: 2019-10-12
4 4
 Title: Estimation of per-position bias in high-throughput sequencing
5 5
         data
... ...
@@ -4,10 +4,10 @@
4 4
 
5 5
 include Makevars.common
6 6
 
7
-RHTSLIB_LIBS=$(shell echo 'Rhtslib::pkgconfig("PKG_LIBS")'|\
8
-    "${R_HOME}/bin/R" --vanilla --slave)
9
-RHTSLIB_CPPFLAGS=$(shell echo 'Rhtslib::pkgconfig("PKG_CPPFLAGS")'|\
10
-    "${R_HOME}/bin/R" --vanilla --slave)
7
+RHTSLIB_LIBS=$(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript" -e \
8
+    'Rhtslib::pkgconfig("PKG_LIBS")')
9
+RHTSLIB_CPPFLAGS=$(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript" -e \
10
+    'Rhtslib::pkgconfig("PKG_CPPFLAGS")')
11 11
 
12 12
 PKG_LIBS=$(RHTSLIB_LIBS)
13 13
 PKG_CPPFLAGS=$(RHTSLIB_CPPFLAGS)