Package: util-linux / 2.25.2-6

Multiarch-support-in-util-linux-build.patch Patch series | download
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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
From: Steve Langasek <steve.langasek@canonical.com>
Date: Sat, 21 Jan 2012 17:23:25 -0500
Subject: Multiarch support in util-linux build

Addresses-Debian-Bug: 631175
Signed-off-by: LaMont Jones <lamont@debian.org>

Conflicts:
	debian/control
	debian/libblkid-dev.files
	debian/libblkid1.files
	debian/libmount-dev.files
	debian/libmount1.files
	debian/libuuid1.files
	debian/rules
	debian/uuid-dev.files
---
 Makefile.am          | 1 +
 configure.ac         | 4 ++--
 libblkid/blkid.pc.in | 1 +
 libmount/mount.pc.in | 1 +
 libuuid/uuid.pc.in   | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 79b5aea..ff99c78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,6 +116,7 @@ edit_cmd = sed \
 	 -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \
 	 -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \
 	 -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \
+	 -e 's|@libexecdir[@]|$(libexecdir)|g' \
 	 -e 's|@VERSION[@]|$(VERSION)|g' \
 	 -e 's|@ADJTIME_PATH[@]|$(ADJTIME_PATH)|g' \
 	 -e 's|@LIBUUID_VERSION[@]|$(LIBUUID_VERSION)|g' \
diff --git a/configure.ac b/configure.ac
index 3eca73e..5a28ff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,6 @@ AS_CASE([$prefix:$localstatedir],
 )
 AC_SUBST([localstatedir])
 
-
 # The original default values of {bin,sbin,lib}dir
 usrbin_execdir='${exec_prefix}/bin'
 AC_SUBST([usrbin_execdir])
@@ -82,9 +81,10 @@ AC_SUBST([usrsbin_execdir])
 AS_CASE([$libdir],
  ['${exec_prefix}/'* | '${prefix}/'* | /usr/* | "${prefix}"/* ],
    [usrlib_execdir=$libdir],
- [usrlib_execdir='${exec_prefix}'$libdir]
+ [usrlib_execdir='${libexecdir}']
 )
 AC_SUBST([usrlib_execdir])
+AC_SUBST([libexecdir])
 
 
 AM_PROG_CC_C_O
diff --git a/libblkid/blkid.pc.in b/libblkid/blkid.pc.in
index 40ec8a9..b89b136 100644
--- a/libblkid/blkid.pc.in
+++ b/libblkid/blkid.pc.in
@@ -1,5 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+libexecdir=@libexecdir@
 libdir=@usrlib_execdir@
 includedir=@includedir@
 
diff --git a/libmount/mount.pc.in b/libmount/mount.pc.in
index 2c32797..b775b14 100644
--- a/libmount/mount.pc.in
+++ b/libmount/mount.pc.in
@@ -1,5 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+libexecdir=@libexecdir@
 libdir=@usrlib_execdir@
 includedir=@includedir@
 
diff --git a/libuuid/uuid.pc.in b/libuuid/uuid.pc.in
index 875de19..a12d432 100644
--- a/libuuid/uuid.pc.in
+++ b/libuuid/uuid.pc.in
@@ -1,5 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+libexecdir=@libexecdir@
 libdir=@usrlib_execdir@
 includedir=@includedir@