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.
88 lines
2.6 KiB
88 lines
2.6 KiB
Index: Makefile |
|
--- Makefile.orig 2017-12-21 10:16:40.000000000 +0100 |
|
+++ Makefile 2018-01-28 10:08:09.507181000 +0100 |
|
@@ -36,9 +36,9 @@ |
|
#skip zwrapper, can't build that on alternate architectures without the proper zlib installed |
|
.PHONY: allzstd |
|
allzstd: |
|
- $(MAKE) -C $(ZSTDDIR) all |
|
- $(MAKE) -C $(PRGDIR) all |
|
- $(MAKE) -C $(TESTDIR) all |
|
+ $(MAKE) $(MFLAGS) -C $(ZSTDDIR) all |
|
+ $(MAKE) $(MFLAGS) -C $(PRGDIR) all |
|
+ $(MAKE) $(MFLAGS) -C $(TESTDIR) all |
|
|
|
.PHONY: all32 |
|
all32: |
|
@@ -118,8 +118,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 2017-12-21 10:16:40.000000000 +0100 |
|
+++ lib/Makefile 2018-01-28 10:10:17.006952000 +0100 |
|
@@ -62,14 +62,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 |
|
@@ -134,11 +134,7 @@ |
|
includedir ?= $(PREFIX)/include |
|
INCLUDEDIR ?= $(includedir) |
|
|
|
-ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly)) |
|
-PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig |
|
-else |
|
PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig |
|
-endif |
|
|
|
ifneq (,$(filter $(shell uname),SunOS)) |
|
INSTALL ?= ginstall |
|
@@ -159,14 +155,11 @@ |
|
-e 's|@VERSION@|$(VERSION)|' \ |
|
$< >$@ |
|
|
|
-install: libzstd.a libzstd libzstd.pc |
|
+install: libzstd.a libzstd.pc |
|
@$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ |
|
@$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ |
|
@echo Installing libraries |
|
@$(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR) |
|
- @$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR) |
|
- @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) |
|
- @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) |
|
@echo Installing includes |
|
@$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) |
|
@$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) |
|
Index: programs/Makefile |
|
--- programs/Makefile.orig 2017-12-21 10:16:40.000000000 +0100 |
|
+++ programs/Makefile 2018-01-28 10:08:09.507492000 +0100 |
|
@@ -259,7 +259,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))
|
|
|