]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
meson_post_install.py: Correct path to dbus-daemon-launch-helper
authorSimon McVittie <smcv@collabora.com>
Mon, 27 Jun 2022 14:41:04 +0000 (15:41 +0100)
committerSimon McVittie <smcv@collabora.com>
Wed, 13 Jul 2022 19:36:13 +0000 (20:36 +0100)
It's installed in the ${libexecdir} for both Autotools and Meson.

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

index 9c558c99fbb3b709cd120bda2ccc836df16b6c8d..30cb7bdffaab281b2c2c889b01d60ed0ed9296dd 100755 (executable)
@@ -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)