From 5f46f6f2d649b2bb8664f9c749e15acd8f529b6c Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 24 Oct 2025 16:46:58 +0000
Subject:  Separate s6 from s6-frontend, fix configure for no-nsss build

---
 package/configure-snippets/configure_generate_configh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'package/configure-snippets/configure_generate_configh')

diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index d93ea7a..23ce34c 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -28,7 +28,14 @@ else
 fi
 
 echo "#undef ${package_macro_name}_REPODIR"
-echo "#define ${package_macro_name}_REPODIR \"$repodir\""
+if test -n "$repodir" ; then
+  echo "#define ${package_macro_name}_REPODIR \"$repodir\""
+else
+  if test -n "$livedir" ; then
+    echo "#include <s6-rc/config.h>"
+  fi
+  echo "#define ${package_macro_name}_REPODIR S6RC_REPO_BASE"
+fi
 
 echo "#undef ${package_macro_name}_BOOTDIR"
 echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\""
@@ -36,6 +43,9 @@ echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\""
 echo "#undef ${package_macro_name}_STMPDIR"
 echo "#define ${package_macro_name}_STMPDIR \"$stmpdir\""
 
+echo "#undef ${package_macro_name}_CONFFILE"
+echo "#define ${package_macro_name}_CONFFILE \"$conffile\""
+
 echo "#undef ${package_macro_name}_DEFPATH"
 echo "#define ${package_macro_name}_DEFPATH \"$defpath\""
 
-- 
cgit v1.3.1