0004-Makefile.in-install-static-library-and-headers-in-in.patch
1.63 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
From 2c2c2d992c3b298793983317588f73cf41675652 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 27 Jul 2016 22:49:58 +0200
Subject: [PATCH] Makefile.in: install static library and headers in
install-static
Currently, the install-static target only installs the statically
compiled tools. However, some programs outside of btrfs-progs (for
example docker) link with the btrfs libraries. If such programs want
to link statically against the btrfs-progs library, then this library
should be installed by "install-static". Indeed, "make install" cannot
be used if the support for shared library is not enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 8450ab3..0d3b490 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -183,7 +183,7 @@ test: test-fsck test-convert test-misc
# NOTE: For static compiles, you need to have all the required libs
# static equivalent available
#
-static: $(progs_static)
+static: $(progs_static) $(libs_static)
version.h: version.sh version.h.in configure.ac
@echo " [SH] $@"
@@ -346,6 +346,10 @@ install-static: $(progs_static) $(INSTALLDIRS)
for p in $(progs_static) ; do \
$(INSTALL) -D -m755 $$p $(DESTDIR)$(bindir)/`basename $$p .static` ; \
done
+ $(INSTALL) -m755 -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(libs_static) $(DESTDIR)$(libdir)
+ $(INSTALL) -m755 -d $(DESTDIR)$(incdir)
+ $(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir)
$(INSTALLDIRS):
@echo "Making install in $(patsubst install-%,%,$@)"
--
2.7.4