install to ../inst/lib

Author: kevinushey

R/hooks.R R/zzz.RR/hooks.R renamed to R/zzz.R

@@ -28,10 +28,6 @@ loadTbbLibrary <- function(name) {
    .tbbMallocDllInfo <<- loadTbbLibrary("tbbmalloc")
 
    # load RcppParallel library if available
-   # (work around https://github.com/r-lib/devtools/issues/2343)
-   if (!file.exists(file.path(libname, pkgname, "lib")))
-      return()
-   
    .dllInfo <<- library.dynam("RcppParallel", pkgname, libname)
 
 }
@@ -49,5 +45,5 @@ loadTbbLibrary <- function(name) {
    # unload tbb if we loaded it
    if (!is.null(.tbbDllInfo))
       dyn.unload(.tbbDllInfo[["path"]])
-
+   
 }

src/install.libs.R

@@ -11,7 +11,7 @@
 
    # copy tbb
    # TODO: use 'dest' library directory once rstan is updated
-   tbbDest <- file.path(R_PACKAGE_DIR, "lib", R_ARCH)
+   tbbDest <- paste0("../inst/lib", R_ARCH)
    dir.create(tbbDest, recursive = TRUE, showWarnings = FALSE)
 
    # check for bundled vs. system tbb