diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-10-24 16:46:58 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2025-10-24 16:46:58 +0000 |
| commit | 5f46f6f2d649b2bb8664f9c749e15acd8f529b6c (patch) | |
| tree | 3eb2a3f71488b932afd24a03b1dad909fa6e9c50 /package/configure-snippets/configure_generate_configh | |
| parent | ad3cffc4b2c3e43053aa914e19cd5649868a7d74 (diff) | |
| download | s6-frontend-5f46f6f2d649b2bb8664f9c749e15acd8f529b6c.tar.gz | |
Separate s6 from s6-frontend, fix configure for no-nsss build
Diffstat (limited to 'package/configure-snippets/configure_generate_configh')
| -rw-r--r-- | package/configure-snippets/configure_generate_configh | 12 |
1 files changed, 11 insertions, 1 deletions
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\"" |