mirror of
https://git.proxmox.com/git/systemd
synced 2026-01-08 18:07:53 +00:00
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
From: Michael Biebl <biebl@debian.org>
|
|
Date: Wed, 11 Sep 2013 23:32:25 +0200
|
|
Subject: Use different default paths for various binaries
|
|
|
|
Since Debian hasn't done the usr-merge (yet), various binaries are still
|
|
installed in / and not /usr.
|
|
Update the defaults in configure.ac so we don't have to build-depend on
|
|
quota, libcap2-bin, procps, kmod and kexec-tools just to get the correct
|
|
paths. Closes: #721347
|
|
---
|
|
configure.ac | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 97a29d6..14e110d 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -87,18 +87,18 @@ AC_PROG_CC_C99
|
|
AC_PATH_PROG([M4], [m4])
|
|
AC_PATH_PROG([XSLTPROC], [xsltproc])
|
|
|
|
-AC_PATH_PROG([QUOTAON], [quotaon], [/usr/sbin/quotaon], [$PATH:/usr/sbin:/sbin])
|
|
-AC_PATH_PROG([QUOTACHECK], [quotacheck], [/usr/sbin/quotacheck], [$PATH:/usr/sbin:/sbin])
|
|
+AC_PATH_PROG([QUOTAON], [quotaon], [/sbin/quotaon], [$PATH:/usr/sbin:/sbin])
|
|
+AC_PATH_PROG([QUOTACHECK], [quotacheck], [/sbin/quotacheck], [$PATH:/usr/sbin:/sbin])
|
|
|
|
-AC_PATH_PROG([SETCAP], [setcap], [/usr/sbin/setcap], [$PATH:/usr/sbin:/sbin])
|
|
+AC_PATH_PROG([SETCAP], [setcap], [/sbin/setcap], [$PATH:/usr/sbin:/sbin])
|
|
|
|
-AC_PATH_PROG([KILL], [kill], [/usr/bin/kill], [$PATH:/usr/sbin:/sbin])
|
|
+AC_PATH_PROG([KILL], [kill], [/bin/kill], [$PATH:/usr/sbin:/sbin])
|
|
|
|
-AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin])
|
|
+AC_PATH_PROG([KMOD], [kmod], [/bin/kmod], [$PATH:/usr/sbin:/sbin])
|
|
|
|
-AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin])
|
|
+AC_PATH_PROG([KEXEC], [kexec], [/sbin/kexec], [$PATH:/usr/sbin:/sbin])
|
|
|
|
-AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
|
|
+AC_PATH_PROG([SULOGIN], [sulogin], [/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
|
|
|
|
AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
|
|
|
|
@@ -1199,13 +1199,13 @@ AC_ARG_WITH(kbd-loadkeys,
|
|
AS_HELP_STRING([--with-kbd-loadkeys=PATH],
|
|
[Path to loadkeys]),
|
|
[KBD_LOADKEYS="$withval"],
|
|
- [KBD_LOADKEYS="/usr/bin/loadkeys"])
|
|
+ [KBD_LOADKEYS="/bin/loadkeys"])
|
|
|
|
AC_ARG_WITH(kbd-setfont,
|
|
AS_HELP_STRING([--with-kbd-setfont=PATH],
|
|
[Path to setfont]),
|
|
[KBD_SETFONT="$withval"],
|
|
- [KBD_SETFONT="/usr/bin/setfont"])
|
|
+ [KBD_SETFONT="/bin/setfont"])
|
|
|
|
AC_DEFINE_UNQUOTED(KBD_LOADKEYS, ["$KBD_LOADKEYS"], [Path of loadkeys])
|
|
AC_DEFINE_UNQUOTED(KBD_SETFONT, ["$KBD_SETFONT"], [Path of setfont])
|