From d709f319232ae40302b7cd73ab945c3d76be01f3 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Fri, 31 Aug 2018 13:38:26 +0200 Subject: Do not hardcode /etc/fuse.conf path. --- util/meson.build | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'util/meson.build') diff --git a/util/meson.build b/util/meson.build index ec08c17..01f7678 100644 --- a/util/meson.build +++ b/util/meson.build @@ -8,10 +8,13 @@ mount_util_c = custom_target('mount_util', command : ['cp', '-a', '@INPUT@', '@OUTPUT@'], ) +fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf') + executable('fusermount3', ['fusermount.c', mount_util_c], include_directories: include_dirs, install: true, - install_dir: get_option('bindir')) + install_dir: get_option('bindir'), + c_args: '-DFUSE_CONF="@0@"'.format(fuseconf_path)) executable('mount.fuse3', ['mount.fuse.c'], include_directories: include_dirs, @@ -25,7 +28,9 @@ if udevrulesdir == '' udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') endif -meson.add_install_script('install_helper.sh', get_option('sysconfdir'), - get_option('bindir'), udevrulesdir) +meson.add_install_script('install_helper.sh', + join_paths(get_option('prefix'), get_option('sysconfdir')), + join_paths(get_option('prefix'), get_option('bindir')), + udevrulesdir) -- cgit v1.2.3