You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
74 lines
1.9 KiB
74 lines
1.9 KiB
Index: Makefile |
|
--- Makefile.orig 2018-06-28 10:55:26.000000000 +0200 |
|
+++ Makefile 2018-06-28 20:51:29.619336000 +0200 |
|
@@ -121,8 +121,8 @@ |
|
|
|
.PHONY: install clangtest armtest usan asan uasan |
|
install: |
|
- @$(MAKE) -C $(ZSTDDIR) $@ |
|
- @$(MAKE) -C $(PRGDIR) $@ |
|
+ @$(MAKE) $(MFLAGS) -C $(ZSTDDIR) $@ |
|
+ @$(MAKE) $(MFLAGS) -C $(PRGDIR) $@ |
|
|
|
.PHONY: uninstall |
|
uninstall: |
|
Index: lib/Makefile |
|
--- lib/Makefile.orig 2018-06-28 10:55:26.000000000 +0200 |
|
+++ lib/Makefile 2018-06-28 20:53:22.318543000 +0200 |
|
@@ -96,14 +96,14 @@ |
|
|
|
.PHONY: default all clean install uninstall |
|
|
|
-default: lib-release |
|
+default: all |
|
|
|
-all: lib |
|
+all: libzstd.a libzstd.pc |
|
|
|
libzstd.a: ARFLAGS = rcs |
|
libzstd.a: $(ZSTD_OBJ) |
|
@echo compiling static library |
|
- @$(AR) $(ARFLAGS) $@ $^ |
|
+ $(AR) $(ARFLAGS) $@ $^ |
|
|
|
libzstd.a-mt: CPPFLAGS += -DZSTD_MULTITHREAD |
|
libzstd.a-mt: libzstd.a |
|
@@ -168,17 +168,9 @@ |
|
includedir ?= $(PREFIX)/include |
|
INCLUDEDIR ?= $(includedir) |
|
|
|
-ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) |
|
-PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig |
|
-else |
|
PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig |
|
-endif |
|
|
|
-ifneq (,$(filter $(shell uname),SunOS)) |
|
-INSTALL ?= ginstall |
|
-else |
|
INSTALL ?= install |
|
-endif |
|
|
|
INSTALL_PROGRAM ?= $(INSTALL) |
|
INSTALL_DATA ?= $(INSTALL) -m 644 |
|
@@ -193,7 +185,7 @@ |
|
-e 's|@VERSION@|$(VERSION)|' \ |
|
$< >$@ |
|
|
|
-install: install-pc install-static install-shared install-includes |
|
+install: install-pc install-static install-includes |
|
@echo zstd static and shared library installed |
|
|
|
install-pc: libzstd.pc |
|
Index: programs/Makefile |
|
--- programs/Makefile.orig 2018-06-28 10:55:26.000000000 +0200 |
|
+++ programs/Makefile 2018-06-28 20:51:29.620081000 +0200 |
|
@@ -261,7 +261,7 @@ |
|
bindir ?= $(exec_prefix)/bin |
|
BINDIR ?= $(bindir) |
|
datarootdir ?= $(PREFIX)/share |
|
-mandir ?= $(datarootdir)/man |
|
+mandir ?= $(PREFIX)/man |
|
man1dir ?= $(mandir)/man1 |
|
|
|
ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
|
|
|