]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
Revert "Honor --sbindir and --bindir for binary installation" 197/head
authorPatrick McLean <chutzpah@gentoo.org>
Sun, 1 Dec 2019 21:59:52 +0000 (13:59 -0800)
committerPatrick McLean <chutzpah@gentoo.org>
Sun, 1 Dec 2019 21:59:52 +0000 (13:59 -0800)
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.

src/Makefile.am

index f31fd7abd5f2030c46db452d940e135c284574e7..7b0aeec8e6ea5b981785ede37e9f753c5f5f99bc 100644 (file)
@@ -2,8 +2,8 @@
 EXTRA_DIST = \
        .indent.pro
 
-ubindir = ${bindir}
-usbindir = ${sbindir}
+ubindir = ${prefix}/bin
+usbindir = ${prefix}/sbin
 suidperms = 4755
 sgidperms = 2755