diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-03-16 22:45:53 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-03-16 22:45:53 +0000 |
| commit | 437dd9c51167f085315a134253e8c4f18c63138d (patch) | |
| tree | e71cf512b56796e5109ec3d9e722e058c2929917 /init | |
| parent | ac1e123e56a2757cb3332e464fff6b23c36fdec1 (diff) | |
| download | hurd-437dd9c51167f085315a134253e8c4f18c63138d.tar.gz hurd-437dd9c51167f085315a134253e8c4f18c63138d.tar.bz2 hurd-437dd9c51167f085315a134253e8c4f18c63138d.zip | |
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.
Diffstat (limited to 'init')
| -rw-r--r-- | init/Makefile | 2 | ||||
| -rw-r--r-- | init/init.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/init/Makefile b/init/Makefile index 07b80261..be4b768b 100644 --- a/init/Makefile +++ b/init/Makefile @@ -21,4 +21,6 @@ SRCS = init.c OBJS = $(SRCS:.c=.o) target = init +init-CPPFLAGS=-DLIBEXECDIR=\"${libexecdir}\" + include ../Makeconf 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 ()) { |