Browse code

further fix; version number not bumped

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/branches/RELEASE_3_2/madman/Rpacks/msa@111668 bc3139a8-67e5-0310-9ffc-ced21a209358

Ulrich Bodenhofer authored on 19/12/2015 19:20:23
Showing4 changed files

... ...
@@ -2,7 +2,7 @@ Package: msa
2 2
 Type: Package
3 3
 Title: Multiple Sequence Alignment
4 4
 Version: 1.2.1
5
-Date: 2015-12-18
5
+Date: 2015-12-19
6 6
 Author: Enrico Bonatesta, Christoph Horejs-Kainrath, Ulrich Bodenhofer
7 7
 Maintainer: Ulrich Bodenhofer <bodenhofer@bioinf.jku.at>
8 8
 Description: This package provides a unified R/Bioconductor interface to the
... ...
@@ -47,6 +47,6 @@ clustalomega:
47 47
 	export PKG_CXXFLAGS="$(PKG_CXXFLAGS) $(SHLIB_OPENMP_CXXFLAGS) -fPIC -DHAVE_CONFIG_H -I. -DCLUSTALO -DCLUSTALO_NOFILE -DDEFAULT_FILTER=90 -I../../gc-7.2/include"; \
48 48
 	export PKG_CFLAGS="$(PKG_CFLAGS) $(SHLIB_OPENMP_CFLAGS) -fPIC -DHAVE_CONFIG_H -I. -DCLUSTALO -DCLUSTALO_NOFILE -DDEFAULT_FILTER=90 -I../../gc-7.2/include"; \
49 49
 	cd src; \
50
-	R CMD SHLIB -o libClustalOmega.so $(CPPNames) && \
50
+	${R_HOME}/bin/R CMD SHLIB -o libClustalOmega.so $(CPPNames) && \
51 51
 	ar rcs libClustalOmega.a $(OBJNames) && \
52 52
 	cp libClustalOmega.a ../../
... ...
@@ -8,6 +8,6 @@ clustalw:
8 8
 	./configure; \
9 9
 	cd src; \
10 10
 	export PKG_CXXFLAGS="-DHAVE_CONFIG_H -I. $(PKG_CXXFLAGS)"; \
11
-	R CMD SHLIB -o libClustalW.so $(CPPNames) && \
11
+	${R_HOME}/bin/R CMD SHLIB -o libClustalW.so $(CPPNames) && \
12 12
 	ar rcs libClustalW.a $(OBJNames) && \
13 13
 	cp libClustalW.a ../../
... ...
@@ -6,6 +6,6 @@ all: muscle
6 6
 
7 7
 muscle:
8 8
 	export PKG_CXXFLAGS="$(PKG_CXXFLAGS) -I../gc-7.2/include"
9
-	R CMD SHLIB -o libMuscle.so $(CPPNames)
9
+	${R_HOME}/bin/R CMD SHLIB -o libMuscle.so $(CPPNames)
10 10
 	ar rcs libMuscle.a $(OBJNames)
11 11
 	cp libMuscle.a ../