Skip to content

Commit 0ff5aa7

Browse files
configure.ac, src/Makefile.am: Follow GNU coding standards regarding directory variables
According to Sam, if we just remove the definitions, autotools will provide the right values. Note that this changes the default from /usr to /usr/local, which is the right value according to the GNU conding standards (and also what the BSDs prefer, according to one conversation I had with Ingo Schwarze from OpenBSD). Closes: <#1229> Link: <https://www.gnu.org/software/autoconf/manual/autoconf-2.72/html_node/Default-Prefix.html> Reported-by: Chris Hofstaedtler <zeha@debian.org> Cc: Sam James <sam@gentoo.org> Signed-off-by: Alejandro Colomar <alx@kernel.org>
1 parent 5d4e20a commit 0ff5aa7

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

configure.ac

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ AC_SUBST([LIBSUBID_ABI_MINOR], [libsubid_abi_minor])
2121
AC_SUBST([LIBSUBID_ABI_MICRO], [libsubid_abi_micro])
2222
AC_SUBST([LIBSUBID_ABI], [libsubid_abi])
2323

24-
dnl Some hacks...
25-
test "x$prefix" = "xNONE" && prefix="/usr"
26-
test "X$prefix" = "X/usr" && exec_prefix=""
27-
2824
AC_USE_SYSTEM_EXTENSIONS
2925

3026
AC_ENABLE_STATIC

src/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
EXTRA_DIST = \
33
.indent.pro
44

5-
ubindir = ${prefix}/bin
6-
usbindir = ${prefix}/sbin
5+
ubindir = ${exec_prefix}/bin
6+
usbindir = ${exec_prefix}/sbin
77
suidperms = 4755
88
sgidperms = 2755
99

@@ -24,7 +24,7 @@ AM_CFLAGS = $(LIBBSD_CFLAGS)
2424
#
2525
# also /lib/libshadow.so.x.xx (if any) could be moved to /usr/lib
2626
# and installation would be much simpler (just two directories,
27-
# $prefix/bin and $prefix/sbin, no install-data hacks...)
27+
# $exec_prefix/bin and $exec_prefix/sbin, no install-data hacks...)
2828

2929
bin_PROGRAMS = login
3030
sbin_PROGRAMS = nologin

0 commit comments

Comments
 (0)