From: Andrei Pavel <andrei@isc.org>
Date: Tue, 6 May 2025 08:50:33 +0000 (+0300)
Subject: [#3866] Meson: Fix SOURCE_OF_INSTALLATION when git is not installed
X-Git-Tag: Kea-2.7.9~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=980ff2dfd2cc913fad31c0a682ef83f90f71ff06;p=thirdparty%2Fkea.git

[#3866] Meson: Fix SOURCE_OF_INSTALLATION when git is not installed
---

diff --git a/meson.build b/meson.build
index 450ea0c6f7..48ded931f5 100644
--- a/meson.build
+++ b/meson.build
@@ -530,8 +530,9 @@ kea_pkg_version_in_configure = run_command(
 ).stdout().strip()
 if kea_pkg_type_in_configure != '' and kea_pkg_version_in_configure != ''
     SOURCE_OF_INSTALLATION = f'@kea_pkg_version_in_configure@ @kea_pkg_type_in_configure@'
-else
-    if fs.is_dir('.git') and git.found()
+elif fs.is_dir('.git')
+    SOURCE_OF_INSTALLATION = 'git'
+    if git.found()
         result = run_command(
             CD_AND_RUN,
             TOP_SOURCE_DIR,
@@ -541,11 +542,11 @@ else
             check: false,
         )
         if result.returncode() == 0
-            SOURCE_OF_INSTALLATION = 'git ' + result.stdout().strip()
+            SOURCE_OF_INSTALLATION += ' ' + result.stdout().strip()
         endif
-    else
-        SOURCE_OF_INSTALLATION = 'tarball'
     endif
+else
+    SOURCE_OF_INSTALLATION = 'tarball'
 endif
 conf_data.set(
     'EXTENDED_VERSION',