update PKG_LIBS to use proper R_HOME location and version bump

armstrtw · Apr 23, 2012 · 7798628 · 7798628
1 parent 5e46746
commit 7798628
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/cppbugs"]
+	path = src/cppbugs
+	url = git@github.com:armstrtw/CppBugs.git
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rcppbugs
 Title: R binding for cppbugs
-Version: 0.0.1
+Version: 0.0.2
 Maintainer: Whit Armstrong <armstrong.whit@gmail.com>
 Author: Whit Armstrong <armstrong.whit@gmail.com>
 Description: R binding for cppbugs

diff --git a/src/Makevars b/src/Makevars
@@ -1 +1,2 @@
-PKG_LIBS = `Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_LIBS = `${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_CXXFLAGS = -I./cppbugs
diff --git a/src/cppbugs b/src/cppbugs