Skip to content

Commit ad3c5a3

Browse files
committed
test lib
1 parent 2c2e97f commit ad3c5a3

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

cleanup.win

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
22

33
HTSLIB_DIR="src/htslib-1.21"
4-
rm -f ${HTSLIB_DIR}/config.h src/*.o src/*.so src/*.dll src/*.dylib
4+
rm -f ${HTSLIB_DIR}/config.h src/*.o src/*.dll src/*.so src/*.dylib
55
cd $HTSLIB_DIR && make clean && cd -

src/Makevars.win

-9
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,4 @@ else
1111
PKG_CPPFLAGS += $(shell pkg-config --cflags libcurl)
1212
endif
1313

14-
.PHONY: all clean
1514

16-
all : $(SHLIB)
17-
18-
clean:
19-
$(RM) *.o
20-
$(RM) *.dll
21-
$(RM) *.so
22-
$(RM) *.dylib
23-
(cd "${HTSLIB_DIR}" && $(MAKE) clean && cd -)

src/install.libs.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
files <- Sys.glob(paste0("*", SHLIB_EXT))
22
files <- c(files, dir("htslib-1.21/", pattern="a$", full.names=TRUE))
3-
dest <- file.path(R_PACKAGE_DIR, paste0('lib', R_ARCH)) ## lib not libs
3+
dest <- file.path(R_PACKAGE_DIR, paste0('libs', R_ARCH))
44
dir.create(dest, recursive = TRUE, showWarnings = FALSE)
55
file.copy(files, dest, overwrite = TRUE)
66

0 commit comments

Comments
 (0)