Line 0
Link Here
|
|
|
1 |
--- Makefile.orig 2014-09-23 14:39:41 UTC |
2 |
+++ Makefile |
3 |
@@ -22,33 +22,27 @@ |
4 |
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
5 |
# DEALINGS IN THE SOFTWARE. |
6 |
|
7 |
-CC = gcc |
8 |
-AR = ar |
9 |
-RANLIB = ranlib |
10 |
+CC ?= cc |
11 |
+AR = /usr/bin/ar |
12 |
+RANLIB = /usr/bin/ranlib |
13 |
|
14 |
# TODO: edit cram code to remove need for -DSAMTOOLS |
15 |
-CPPFLAGS = -I. -DSAMTOOLS=1 |
16 |
+CPPFLAGS += -I. -DSAMTOOLS=1 -Wno-unused-function -Wno-implicit-function-declaration |
17 |
# TODO: probably update cram code to make it compile cleanly with -Wc++-compat |
18 |
-CFLAGS = -g -Wall -O2 |
19 |
+CFLAGS += -g -Wall -O2 |
20 |
EXTRA_CFLAGS_PIC = -fpic |
21 |
-LDFLAGS = |
22 |
-LDLIBS = |
23 |
+LDFLAGS += |
24 |
+LDLIBS += |
25 |
|
26 |
-prefix = /usr/local |
27 |
+prefix = ${STAGEDIR}${PREFIX} |
28 |
exec_prefix = $(prefix) |
29 |
bindir = $(exec_prefix)/bin |
30 |
includedir = $(prefix)/include |
31 |
libdir = $(exec_prefix)/lib |
32 |
-mandir = $(prefix)/share/man |
33 |
+mandir = $(prefix)/man |
34 |
man1dir = $(mandir)/man1 |
35 |
man5dir = $(mandir)/man5 |
36 |
-pkgconfigdir= $(libdir)/pkgconfig |
37 |
- |
38 |
-MKDIR_P = mkdir -p |
39 |
-INSTALL = install -p |
40 |
-INSTALL_PROGRAM = $(INSTALL) |
41 |
-INSTALL_DATA = $(INSTALL) -m 644 |
42 |
-INSTALL_DIR = $(MKDIR_P) -m 755 |
43 |
+pkgconfigdir= $(exec_prefix)/libdata/pkgconfig |
44 |
|
45 |
BUILT_PROGRAMS = \ |
46 |
bgzip \ |
47 |
@@ -62,7 +56,7 @@ BUILT_TEST_PROGRAMS = \ |
48 |
test/test-vcf-api \ |
49 |
test/test-vcf-sweep |
50 |
|
51 |
-all: lib-static lib-shared $(BUILT_PROGRAMS) $(BUILT_TEST_PROGRAMS) |
52 |
+all: lib-static lib-shared $(BUILT_PROGRAMS) |
53 |
|
54 |
HTSPREFIX = |
55 |
include htslib_vars.mk |
56 |
@@ -284,7 +278,7 @@ installdirs: |
57 |
# and libhts.so.NN (used by client executables at runtime). |
58 |
|
59 |
install-so: libhts.so installdirs |
60 |
- $(INSTALL_DATA) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION) |
61 |
+ $(INSTALL_LIB) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION) |
62 |
ln -sf libhts.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libhts.so |
63 |
ln -sf libhts.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libhts.so.$(LIBHTS_SOVERSION) |
64 |
|