From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] build: use MultiArch paths for `make ..`
Date: Tue, 11 Nov 2025 16:14:46 +0100 [thread overview]
Message-ID: <20251111151537.992758-1-f.gruenbichler@proxmox.com> (raw)
instead of just when building a package, otherwise plain `make; sudo make
install` installs to the wrong paths..
Reported-by: Robert Obkircher <r.obkircher@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@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
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next reply other threads:[~2025-11-11 15:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-11 15:14 Fabian Grünbichler [this message]
2025-11-12 10:18 ` Robert Obkircher
2025-11-12 11:17 ` Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251111151537.992758-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.