[pbs-devel] [PATCH proxmox-backup] build: use MultiArch paths for `make ..`

[Fabian Grünbichler]

instead of just when building a package, otherwise plain `make; sudo make
install` installs to the wrong paths..

Reported-by: Robert Obkircher <r.obkircher at proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 Makefile     | 2 ++
 debian/rules | 8 ++------
 defines.mk   | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 2012ae5d2..21b4440fc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 include /usr/share/dpkg/default.mk
 include /usr/share/rustc/architecture.mk
+
+export DEB_HOST_MULTIARCH
 include defines.mk
 
 PACKAGE := proxmox-backup
diff --git a/debian/rules b/debian/rules
index ab48cce19..4c73c4ebf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,17 +49,13 @@ override_dh_auto_configure:
 	dh_auto_configure
 
 override_dh_auto_build:
-	dh_auto_build -- \
-	    PROXY_USER=backup \
-	    LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_build -- PROXY_USER=backup
 
 override_dh_missing:
 	dh_missing --fail-missing
 
 override_dh_auto_install:
-	dh_auto_install -- \
-	    PROXY_USER=backup \
-	    LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_install -- PROXY_USER=backup
 	mkdir -p debian/proxmox-backup-client-static/usr/bin
 	mv debian/tmp/usr/bin/proxmox-backup-client-static debian/proxmox-backup-client-static/usr/bin/proxmox-backup-client
 	mv debian/tmp/usr/bin/pxar-static debian/proxmox-backup-client-static/usr/bin/pxar
diff --git a/defines.mk b/defines.mk
index cd5b52a2a..7e550d5c2 100644
--- a/defines.mk
+++ b/defines.mk
@@ -1,7 +1,7 @@
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 SBINDIR = $(PREFIX)/sbin
-LIBDIR = $(PREFIX)/lib
+LIBDIR = $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
 LIBEXECDIR = $(LIBDIR)
 DATAROOTDIR = $(PREFIX)/share
 MAN1DIR = $(PREFIX)/share/man/man1
-- 
2.47.3