Fix muon build in Alpine

diff --git a/.ci/muon/run.sh b/.ci/muon/run.sh
index 933ef8c84ea56d4c23d756d61ccc45292212d74a..1499c33d7462995402566e0b2082f6155c21f52a 100755 (executable)
--- a/.ci/muon/run.sh
+++ b/.ci/muon/run.sh
@@ -13,5 +13,15 @@ else
   exit 1
 fi
 
+if samu --version >/dev/null; then
+  SAMU=samu
+elif ninja --version >/dev/null; then
+  SAMU=ninja
+else
+  echo 'Neither samu nor ninja found' >&2
+  exit 1
+fi
+
 $MUON setup "$dir"
-$MUON -C "$dir" test basic.py
+$SAMU -C "$dir"
+"$dir"/src/tinc --version

diff --git a/src/include/meson.build b/src/include/meson.build
index c192f1865410b93e9bfbda345f85e92b05efa06e..1cbd8ca6a3fd45eb3dcd1454956ecc199b458858 100644 (file)
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -1,7 +1,7 @@
 configure_file(output: 'config.h', configuration: cdata)
 
 src_lib_common += vcs_tag(
-  command: [python_path, src_root / 'version.py'],
+  command: [src_root / 'version.py'],
   input: '../version_git.h.in',
   output: 'version_git.h',
 )