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.
108 lines
2.8 KiB
108 lines
2.8 KiB
Index: Makefile |
|
--- Makefile.orig 2021-03-02 23:20:57.000000000 +0100 |
|
+++ Makefile 2021-03-04 19:33:43.170805000 +0100 |
|
@@ -49,8 +49,8 @@ |
|
# skip zwrapper, can't build that on alternate architectures without the proper zlib installed |
|
.PHONY: allzstd |
|
allzstd: lib |
|
- $(Q)$(MAKE) -C $(PRGDIR) all |
|
- $(Q)$(MAKE) -C $(TESTDIR) all |
|
+ $(Q)$(MAKE) $(MFLAGS) -C $(PRGDIR) all |
|
+ $(Q)$(MAKE) $(MFLAGS) -C $(TESTDIR) all |
|
|
|
.PHONY: all32 |
|
all32: |
|
@@ -59,11 +59,11 @@ |
|
|
|
.PHONY: lib lib-release |
|
lib lib-release : |
|
- $(Q)$(MAKE) -C $(ZSTDDIR) $@ |
|
+ $(Q)$(MAKE) $(MFLAGS) -C $(ZSTDDIR) $@ |
|
|
|
.PHONY: zstd zstd-release |
|
zstd zstd-release: |
|
- $(Q)$(MAKE) -C $(PRGDIR) $@ |
|
+ $(Q)$(MAKE) $(MFLAGS) -C $(PRGDIR) $@ |
|
$(Q)ln -sf $(PRGDIR)/zstd$(EXT) zstd$(EXT) |
|
|
|
.PHONY: zstdmt |
|
@@ -113,7 +113,7 @@ |
|
## man: generate man page |
|
.PHONY: man |
|
man: |
|
- $(MAKE) -C programs $@ |
|
+ $(MAKE) $(MFLAGS) -C programs $@ |
|
|
|
## contrib: build all supported projects in `/contrib` directory |
|
.PHONY: contrib |
|
@@ -181,8 +181,8 @@ |
|
|
|
.PHONY: install armtest usan asan uasan |
|
install: |
|
- $(Q)$(MAKE) -C $(ZSTDDIR) $@ |
|
- $(Q)$(MAKE) -C $(PRGDIR) $@ |
|
+ $(Q)$(MAKE) $(MFLAGS) -C $(ZSTDDIR) $@ |
|
+ $(Q)$(MAKE) $(MFLAGS) -C $(PRGDIR) $@ |
|
|
|
.PHONY: uninstall |
|
uninstall: |
|
Index: lib/Makefile |
|
--- lib/Makefile.orig 2021-03-02 23:20:57.000000000 +0100 |
|
+++ lib/Makefile 2021-03-04 19:34:03.709776000 +0100 |
|
@@ -9,7 +9,7 @@ |
|
# ################################################################ |
|
|
|
.PHONY: default |
|
-default: lib-release |
|
+default: all |
|
|
|
# define silent mode as default (verbose mode with V=1 or VERBOSE=1) |
|
$(V)$(VERBOSE).SILENT: |
|
@@ -218,7 +218,7 @@ |
|
|
|
|
|
.PHONY: all |
|
-all: lib |
|
+all: libzstd.a libzstd.pc |
|
|
|
|
|
.PHONY: libzstd.a # must be run every time |
|
@@ -380,17 +380,9 @@ |
|
# to PREFIX, rather than as a resolved value. |
|
PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix}) |
|
|
|
-ifneq (,$(filter $(UNAME),FreeBSD NetBSD DragonFly)) |
|
- PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig |
|
-else |
|
PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig |
|
-endif |
|
|
|
-ifneq (,$(filter $(UNAME),SunOS)) |
|
- INSTALL ?= ginstall |
|
-else |
|
INSTALL ?= install |
|
-endif |
|
|
|
INSTALL_PROGRAM ?= $(INSTALL) |
|
INSTALL_DATA ?= $(INSTALL) -m 644 |
|
@@ -408,7 +400,7 @@ |
|
$< >$@ |
|
|
|
.PHONY: install |
|
-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 2021-03-02 23:20:57.000000000 +0100 |
|
+++ programs/Makefile 2021-03-04 19:33:09.689569000 +0100 |
|
@@ -444,7 +444,7 @@ |
|
bindir ?= $(exec_prefix)/bin |
|
BINDIR ?= $(bindir) |
|
datarootdir ?= $(PREFIX)/share |
|
-mandir ?= $(datarootdir)/man |
|
+mandir ?= $(PREFIX)/man |
|
man1dir ?= $(mandir)/man1 |
|
|
|
ifneq (,$(filter $(UNAME),OpenBSD FreeBSD NetBSD DragonFly SunOS))
|
|
|