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
|
From: Marco Nenciarini <mnencia@debian.org>
Date: Wed, 11 Sep 2024 14:39:58 +0200
Subject: Adjust uuid-config to a Debian multiarch environment (it lives in
/bin, so we can't embed an arch-specific path in it)
---
uuid-config.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/uuid-config.in b/uuid-config.in
index f17f4e0..7e0d892 100644
--- a/uuid-config.in
+++ b/uuid-config.in
@@ -35,7 +35,14 @@ datarootdir="@datarootdir@"
uuid_prefix="$prefix"
uuid_exec_prefix="$exec_prefix"
uuid_bindir="@bindir@"
-uuid_libdir="@libdir@"
+uuid_libdir="/usr/lib"
+if [ -n "$DEB_HOST_MULTIARCH" ]; then
+ uuid_libdir="/usr/lib/$DEB_HOST_MULTIARCH"
+elif [ -n "$DEB_HOST_ARCH" ] && command -v dpkg-architecture >/dev/null; then
+ uuid_libdir="/usr/lib/$(dpkg-architecture -a$DEB_HOST_ARCH -qDEB_HOST_MULTIARCH)"
+elif command -v dpkg-architecture >/dev/null; then
+ uuid_libdir="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+fi
uuid_includedir="@includedir@"
uuid_mandir="@mandir@"
uuid_datadir="@datadir@"
|