install into lib dir

jjallaire · jjallaire · commit 5710aad85610 · 2014-06-28T03:08:36.000-07:00
diff --git a/R/tbb.R b/R/tbb.R
@@ -14,7 +14,7 @@ dllInfo <- NULL
       ext = ".dll"
    else
       ext = .Platform$dynlib.ext
-   dll <- system.file(paste("libs/libtbb", ext, sep = ""), package = "tbb")
+   dll <- system.file(paste("lib/libtbb", ext, sep = ""), package = "tbb")
    dllInfo <<- dyn.load(dll, local = FALSE, now = TRUE)
    
    # load the tbb package library
diff --git a/inst/.gitignore b/inst/.gitignore
@@ -1,2 +1 @@
-tbb/
-libs
+lib/
diff --git a/src/Makevars b/src/Makevars
@@ -7,7 +7,7 @@ all: $(SHLIB)
 $(SHLIB): tbb 
 
 tbb:
-	mkdir -p ../inst/libs
+	mkdir -p ../inst/lib
 	(cd tbb/src; make tbb_release tbb_build_prefix=lib)
-	cp tbb/build/lib_release/libtbb.* ../inst/libs
+	cp tbb/build/lib_release/libtbb.* ../inst/lib
 
