From d5a95760ef40fdeb30dcbb79e2c3e4c10b56eb8c Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 22 Oct 2023 11:47:52 +0200 Subject: [PATCH] Replace hardcoded /run/finit/system with configured path Signed-off-by: Joachim Wiberg --- configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 44659108..24efaac4 100644 --- a/configure.ac +++ b/configure.ac @@ -293,12 +293,17 @@ AM_CONDITIONAL(DOC, [test "x$enable_doc" = "xyes"]) AM_CONDITIONAL(CONTRIB, [test "x$enable_contrib" = "xyes"]) AM_CONDITIONAL(TESTSERV, [test "x$enable_testserv_plugin" = "xyes"]) +# Workaround for as-of-yet unreleased runstatedir support, planned for +# autoconf 2.70, which some major distros have backported. +AS_IF([test -z "$runstatedir"], runstatedir="$localstatedir/run") +AC_SUBST(runstatedir) + # Override default libdir, used for plugins and rescue.conf pkglibdir=$libdir/finit AC_SUBST(pkglibexecdir) AC_EXPAND_DIR(pkglibexecdir, "$libexecdir/finit") AC_DEFINE_UNQUOTED(FINIT_EXECPATH_, "$pkglibexecdir", [Finit libexec path]) -AC_DEFINE_UNQUOTED(FINIT_RUNPATH_, "/run/finit/system", [Finit runtime dynamic system services]) +AC_DEFINE_UNQUOTED(FINIT_RUNPATH_, "$runstatedir/finit/system", [Finit runtime dynamic system services]) AC_EXPAND_DIR(plugin_path, "$pkglibdir/plugins") AC_SUBST(plugin_path)