From: Simon McVittie <smcv@collabora.com>
Date: Mon, 27 Jun 2022 14:41:04 +0000 (+0100)
Subject: meson_post_install.py: Correct path to dbus-daemon-launch-helper
X-Git-Tag: dbus-1.15.0~32^2~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f6fd74a315d7e5f8c7ac57a82cc999a9b34195e;p=thirdparty%2Fdbus.git

meson_post_install.py: Correct path to dbus-daemon-launch-helper

It's installed in the ${libexecdir} for both Autotools and Meson.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/meson_post_install.py b/meson_post_install.py
index 9c558c99f..30cb7bdff 100755
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -56,7 +56,7 @@ def to_destdir(path):
 ###############################################################################
 
 # Define paths here
-abs_libdir = destdir_prefix / get_option('libdir')
+abs_libexecdir = destdir_prefix / get_option('libexecdir')
 
 relocation = sys.argv[1].lower() == 'true'
 
@@ -88,7 +88,7 @@ def post_install_exe():
     if daemon_launch_helper:
         import grp
         exe_name = os.path.basename(daemon_launch_helper['install_filename'][0])
-        exe_path = abs_libdir / 'dbus-1.0' / exe_name
+        exe_path = abs_libexecdir / exe_name
         dbus_user = get_option('dbus_user')
         if os.getuid() == 0:
             os.chown(exe_path, 0, grp.getgrnam(dbus_user).gr_gid)