From 437dd9c51167f085315a134253e8c4f18c63138d Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 16 Mar 2021 22:45:53 +0000 Subject: Do not hardcode /libexec libexecdir So that distributions can use the --libexecdir configure parameter. * configure.ac (AC_CONFIG_FILES): Add daemons/runsystem.hurd.sh. * config/ttys: Rename to ttys.in, replace /libexec with @libexecdir@. * config/Makefile (ttys): Generate from ttys.in * daemons/runsystem.hurd.sh.in (prefix): Define to @prefix@. (exec_prefix): Define to @exec_prefix@. (RUNCOM, RUNTTYS): Replace /libexec with @libexecdir@. * init/Makefile (init-CPPFLAGS): Define LIBEXECDIR. * init/init.c (main): Use LIBEXECDIR instead of hardcoding /libexec. * startup/Makefile (startup-CPPFLAGS): Define LIBEXECDIR. * startup/startup.c (start_child, launch_something): Use LIBEXECDIR instead of hardcoding /libexec. --- daemons/runsystem.hurd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'daemons/runsystem.hurd.sh') diff --git a/daemons/runsystem.hurd.sh b/daemons/runsystem.hurd.sh index f4f27711..54f427dc 100644 --- a/daemons/runsystem.hurd.sh +++ b/daemons/runsystem.hurd.sh @@ -23,8 +23,10 @@ fallback_shells='/bin/sh /bin/bash /bin/csh /bin/ash /bin/shd' SHELL=/bin/sh # Programs that do multi-user startup. -RUNCOM=/libexec/rc -RUNTTYS=/libexec/runttys +prefix= +exec_prefix=${prefix} +RUNCOM=${exec_prefix}/libexec/rc +RUNTTYS=${exec_prefix}/libexec/runttys # Signals that we should pass down to runttys. runttys_sigs='TERM INT HUP TSTP' -- cgit v1.2.3