Explicitly pass {s,}bindir to configure

Avoids upstream hacks in configure. Gbp-Dch: full
2025-02-24 23:26:20 +01:00
parent 47ba166e47
commit 193bcdacf8
5 changed files with 28 additions and 2 deletions
@@ -0,0 +1,23 @@
+From: Chris Hofstaedtler <zeha@debian.org>
+Date: Mon, 24 Feb 2025 23:24:41 +0100
+Subject: configure.ac: align exec_prefix with prefix
+
+Hopefully upstream will fix this one day.
+Reported as https://github.com/shadow-maint/shadow/issues/1229
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 36c57d8..8a9c05a 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -18,7 +18,7 @@ AC_SUBST([LIBSUBID_ABI], [libsubid_abi])
+ 
+ dnl Some hacks...
+ test "$prefix" = "NONE" && prefix="/usr"
+-test "$prefix" = "/usr" && exec_prefix=""
+test "$prefix" = "/usr" && exec_prefix="/usr"
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ 
@@ -10,7 +10,7 @@ Forwarded: https://github.com/shadow-maint/shadow/issues/1224
 1 file changed, 1 insertion(+), 7 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index 36c57d8..94fef7e 100644
+index 8a9c05a..b7cc59c 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -115,13 +115,7 @@ AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog",
@@ -7,6 +7,7 @@ debian/Adapt-login.defs-for-Debian.patch
 debian/Define-LOGIN_NAME_MAX-on-HURD.patch
 debian/Stop-building-programs-we-do-not-install.patch
 debian/Warn-when-badname-and-variants-are-given.patch
+debian/configure.ac-align-exec_prefix-with-prefix.patch
 debian/configure.ac-be-deterministic-about-passwd-location.patch
 upstream/Revert-lib-src-Use-local-time-for-human-readable-dates.patch
 upstream/src-chfn.c-Partially-revert-lib-src-Use-strsep-3-instead-.patch
@@ -10,6 +10,8 @@ include /usr/share/debhelper/dh_package_notes/package-notes.mk

 # Adds extra options when calling the configure script:
 DEB_CONFIGURE_EXTRA_FLAGS := \
+	--bindir=/usr/bin \
+	--sbindir=/usr/sbin \
 	--mandir=/usr/share/man \
 	--with-libpam \
 	--with-yescrypt \
@@ -1,3 +1,3 @@
-bin/getsubids usr/bin
+usr/bin/getsubids
 usr/bin/newgidmap
 usr/bin/newuidmap