|
@@ -0,0 +1,45 @@
|
|
|
+From 9a0643b633c00e86db059e3790bdea7155fb6dc9 Mon Sep 17 00:00:00 2001
|
|
|
+From: Baruch Siach <baruch@tkos.co.il>
|
|
|
+Date: Tue, 8 May 2018 20:43:28 +0300
|
|
|
+Subject: [PATCH] lib/Makefile: create include directory before headers
|
|
|
+ installation
|
|
|
+
|
|
|
+Make sure that $(INCLUDEDIR) exists before copying the headers there.
|
|
|
+Otherwise, the contest of header files is copied over
|
|
|
+$(DESTDIR)$(INCLUDEDIR), making it a regular file.
|
|
|
+
|
|
|
+While at it, remove $(DESTDIR)$(INCLUDEDIR) from the list of directories
|
|
|
+to create in the install-pc target. The install-pc target does not need
|
|
|
+this directory.
|
|
|
+
|
|
|
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
|
+---
|
|
|
+Upstream status: https://github.com/facebook/zstd/pull/1123
|
|
|
+
|
|
|
+ lib/Makefile | 3 ++-
|
|
|
+ 1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
+
|
|
|
+diff --git a/lib/Makefile b/lib/Makefile
|
|
|
+index f64f192d4724..d8178c7a58a0 100644
|
|
|
+--- a/lib/Makefile
|
|
|
++++ b/lib/Makefile
|
|
|
+@@ -163,7 +163,7 @@ install: install-pc install-static install-shared install-includes
|
|
|
+ @echo zstd static and shared library installed
|
|
|
+
|
|
|
+ install-pc: libzstd.pc
|
|
|
+- @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/
|
|
|
++ @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/
|
|
|
+ @$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
|
|
|
+
|
|
|
+ install-static: libzstd.a
|
|
|
+@@ -178,6 +178,7 @@ install-shared: libzstd
|
|
|
+
|
|
|
+ install-includes:
|
|
|
+ @echo Installing includes
|
|
|
++ @$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
|
|
|
+ @$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
|
|
|
+ @$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
|
|
|
+ @$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings
|
|
|
+--
|
|
|
+2.17.0
|
|
|
+
|