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 /startup | |
| 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 'startup')
| -rw-r--r-- | startup/Makefile | 1 | ||||
| -rw-r--r-- | startup/startup.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/startup/Makefile b/startup/Makefile index 8df0bd85..43c75187 100644 --- a/startup/Makefile +++ b/startup/Makefile @@ -34,6 +34,7 @@ notifyServer-CFLAGS="-DMIG_EOPNOTSUPP=EOPNOTSUPP" fsysServer-CFLAGS="-DMIG_EOPNOTSUPP=EOPNOTSUPP" fsServer-CFLAGS="-DMIG_EOPNOTSUPP=EOPNOTSUPP" ioServer-CFLAGS="-DMIG_EOPNOTSUPP=EOPNOTSUPP" +startup-CPPFLAGS=-DLIBEXECDIR=\"${libexecdir}\" include ../Makeconf diff --git a/startup/startup.c b/startup/startup.c index 00d58989..9faeb462 100644 --- a/startup/startup.c +++ b/startup/startup.c @@ -1261,7 +1261,7 @@ start_child (const char *prog, char **progargs) if (progargs == 0) { - const char *argv[] = { "/libexec/console-run", prog, 0 }; + const char *argv[] = { LIBEXECDIR "/console-run", prog, 0 }; err = argz_create ((char **) argv, &args, &arglen); } else @@ -1271,7 +1271,7 @@ start_child (const char *prog, char **progargs) ++argc; { const char *argv[2 + argc + 1]; - argv[0] = "/libexec/console-run"; + argv[0] = LIBEXECDIR "/console-run"; argv[1] = prog; argv[2 + argc] = 0; while (argc-- > 0) @@ -1347,7 +1347,7 @@ launch_something (const char *why) static unsigned int try; static const char *const tries[] = { - "/libexec/runsystem", + LIBEXECDIR "/runsystem", _PATH_BSHELL, "/bin/shd", /* XXX */ }; |