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. --- init/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'init/init.c') diff --git a/init/init.c b/init/init.c index 93e0470a..ca40d527 100644 --- a/init/init.c +++ b/init/init.c @@ -139,7 +139,7 @@ main (int argc, char **argv) sa.sa_flags |= SA_RESTART; sigaction (SIGCHLD, &sa, NULL); - char *args[] = { "/libexec/runsystem.hurd", NULL }; + char *args[] = { LIBEXECDIR "/runsystem.hurd", NULL }; switch (child_pid = fork ()) { -- cgit v1.2.3