From: Patrick McLean <chutzpah@gentoo.org>
Date: Sun, 1 Dec 2019 21:59:52 +0000 (-0800)
Subject: Revert "Honor --sbindir and --bindir for binary installation"
X-Git-Tag: 4.8.1~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F197%2Fhead;p=thirdparty%2Fshadow.git

Revert "Honor --sbindir and --bindir for binary installation"

This reverts commit e293aa9cfca0619a63616af75532637dab60d49d.

See https://github.com/shadow-maint/shadow/issues/196

Some distros still care about `/bin` vs `/usr/bin`. This commit makes
it so all binaries are always installed to `/bin`/`/sbin`. The only way to
restore the previous behaviour of installing some binaries to
`/usr/bin`/`/usr/sbin` is to revert the patch.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index f31fd7abd..7b0aeec8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@
 EXTRA_DIST = \
 	.indent.pro
 
-ubindir = ${bindir}
-usbindir = ${sbindir}
+ubindir = ${prefix}/bin
+usbindir = ${prefix}/sbin
 suidperms = 4755
 sgidperms = 2755