Browse code

Merge pull request #209 from grimbough/master

Fix issue introduced by changing quotes in Rhdf5lib::pkgconfig()

Steffen Neumann authored on 15/10/2019 08:26:25 • GitHub committed on 15/10/2019 08:26:25
Showing 2 changed files

... ...
@@ -2,7 +2,7 @@ Package: mzR
2 2
 Type: Package
3 3
 Title: parser for netCDF, mzXML, mzData and mzML and mzIdentML files
4 4
        (mass spectrometry data)
5
-Version: 2.19.6
5
+Version: 2.19.7
6 6
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou, Johannes Rainer
7 7
 Maintainer: Steffen Neumann <sneumann@ipb-halle.de>,
8 8
 	    Laurent Gatto <lg390@cam.ac.uk>,
... ...
@@ -118,7 +118,7 @@ RHDF5_LIBS=$(shell echo 'Rhdf5lib::pkgconfig("PKG_CXX_LIBS")'| "${R_HOME}/bin/R"
118 118
 else
119 119
 ARCH_OBJS=./boost/libs/thread/src/pthread/once.o \
120 120
 ./boost/libs/thread/src/pthread/thread.o
121
-RHDF5_LIBS=`echo 'Rhdf5lib::pkgconfig("PKG_CXX_LIBS")'| "${R_HOME}/bin/R" --vanilla --slave`
121
+RHDF5_LIBS=$(shell echo 'Rhdf5lib::pkgconfig("PKG_CXX_LIBS")'| "${R_HOME}/bin/R" --vanilla --slave)
122 122
 endif
123 123
 
124 124
 MZROBJECTS=cramp.o ramp_base64.o ramp.o RcppRamp.o RcppRampModule.o RcppPwiz.o RcppPwizModule.o RcppIdent.o RcppIdentModule.o