tweak copy patterns

Author: kevinushey

src/Makevars.in

@@ -114,9 +114,9 @@ ifeq ($(USE_TBB), SunOS)
 endif
 
 # Write compilation output to file, and log it if installation fails.
-ifneq ($(OS), Windows_NT)
-  MAKE_ARGS += > tbb.log 2>&1 && echo "(tbb) TBB successfully built and installed." || cat tbb.log; rm -f tbb.log
-endif
+MAKE_ARGS += > tbb.log 2>&1 \
+	&& echo "(tbb) TBB successfully built and installed." \
+	|| cat tbb.log; rm -f tbb.log
 
 .PHONY: all tbb tbb-clean
 

src/install.libs.R

@@ -20,12 +20,14 @@
    if (is.na(tbbLib) && !is.na(tbbRoot))
       tbbLib <- file.path(tbbRoot, "lib")
 
+   shlibPattern <- "[.](?:so|dylib|dll)$"
+   
    if (is.na(tbbLib)) {
 
       # using bundled TBB
       tbbLibs <- list.files(
          path       = "tbb/build/lib_release",
-         pattern    = "^libtbb",
+         pattern    = shlibPattern,
          full.names = TRUE
       )
 
@@ -37,7 +39,7 @@
       # using system tbb
       tbbLibs <- list.files(
          path       = tbbLib,
-         pattern    = "[.](?:so|dylib|dll)$",
+         pattern    = shlibPattern,
          full.names = TRUE
       )