From e17e5ba9bff633b5f2b6e9950b3bb64b59079c74 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 13 Apr 2017 10:30:56 -0400 Subject: [PATCH] meson: use join_paths consistently With -Dsplit-usr=true, we set rootprefix to /. This leads to //lib/systemd or //lib/udev for various dir variables. Using join_paths() avoids this. --- hwdb/meson.build | 2 +- man/meson.build | 8 +- meson.build | 148 +++++++++++++++--------------- network/meson.build | 2 +- po/meson.build | 2 +- shell-completion/bash/meson.build | 2 +- shell-completion/zsh/meson.build | 2 +- src/boot/efi/meson.build | 4 +- src/core/meson.build | 8 +- src/journal-remote/meson.build | 2 +- src/kernel-install/meson.build | 2 +- src/locale/meson.build | 4 +- src/udev/meson.build | 4 +- sysctl.d/meson.build | 2 +- tmpfiles.d/meson.build | 2 +- units/meson.build | 26 +++--- 16 files changed, 110 insertions(+), 110 deletions(-) diff --git a/hwdb/meson.build b/hwdb/meson.build index bffac3bae6..cbc9016652 100644 --- a/hwdb/meson.build +++ b/hwdb/meson.build @@ -24,5 +24,5 @@ if conf.get('ENABLE_HWDB', 0) == 1 install_dir : udevhwdbdir) meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/udev/hwdb.d')) + mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) endif diff --git a/man/meson.build b/man/meson.build index 691750c466..c945c662f5 100644 --- a/man/meson.build +++ b/man/meson.build @@ -52,7 +52,7 @@ foreach tuple : manpages htmlaliases += [alias + '.html'] endforeach - mandirn = get_option('mandir') + '/man' + section + mandirn = join_paths(get_option('mandir'), 'man' + section) have = condition == '' or conf.get(condition, 0) == 1 @@ -74,7 +74,7 @@ foreach tuple : manpages command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'], depend_files : custom_entities_ent, install : want_html, - install_dir : docdir + '/html') + install_dir : join_paths(docdir, 'html')) html_pages += [p2] source_xml_files += files(tuple[0] + '.xml') @@ -107,7 +107,7 @@ foreach tuple : [['systemd.directives', '7', systemd_directives_xml], html = stem + '.html' man = stem + '.' + section - mandirn = get_option('mandir') + '/man' + section + mandirn = join_paths(get_option('mandir'), 'man' + section) p1 = custom_target( man, @@ -124,7 +124,7 @@ foreach tuple : [['systemd.directives', '7', systemd_directives_xml], output : html, command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'], install : want_html, - install_dir : docdir + '/html') + install_dir : join_paths(docdir, 'html')) html_pages += [p2] endforeach diff --git a/meson.build b/meson.build index a28090240d..835da3174e 100644 --- a/meson.build +++ b/meson.build @@ -66,118 +66,118 @@ if rootlibdir == '' endif # Dirs of external packages -pkgconfigdatadir = datadir + '/pkgconfig' -pkgconfiglibdir = libdir + '/pkgconfig' -polkitpolicydir = datadir + '/polkit-1/actions' -polkitrulesdir = datadir + '/polkit-1/rules.d' -polkitpkladir = localstatedir + '/lib/polkit-1/localauthority/10-vendor.d' -varlogdir = localstatedir + '/log' -xinitrcdir = sysconfdir + '/X11/xinit/xinitrc.d' +pkgconfigdatadir = join_paths(datadir, 'pkgconfig') +pkgconfiglibdir = join_paths(libdir, 'pkgconfig') +polkitpolicydir = join_paths(datadir, 'polkit-1/actions') +polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d') +polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d') +varlogdir = join_paths(localstatedir, 'log') +xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d') rpmmacrosdir = get_option('rpmmacrosdir') # Our own paths -pkgdatadir = datadir + '/systemd' -environmentdir = prefixdir + '/lib/environment.d' -pkgsysconfdir = sysconfdir + '/systemd' -userunitdir = prefixdir + '/lib/systemd/user' -userpresetdir = prefixdir + '/lib/systemd/user-preset' -tmpfilesdir = prefixdir + '/lib/tmpfiles.d' -sysusersdir = prefixdir + '/lib/sysusers.d' -sysctldir = prefixdir + '/lib/sysctl.d' -binfmtdir = prefixdir + '/lib/binfmt.d' -modulesloaddir = prefixdir + '/lib/modules-load.d' -networkdir = rootprefixdir + '/lib/systemd/network' -pkgincludedir = includedir + '/systemd' -systemgeneratordir = rootlibexecdir + '/system-generators' -usergeneratordir = prefixdir + '/lib/systemd/user-generators' -systemenvgeneratordir = prefixdir + '/lib/systemd/system-environment-generators' -userenvgeneratordir = prefixdir + '/lib/systemd/user-environment-generators' -systemshutdowndir = rootlibexecdir + '/system-shutdown' -systemsleepdir = rootlibexecdir + '/system-sleep' -systemunitdir = rootprefixdir + '/lib/systemd/system' -systempresetdir = rootprefixdir + '/lib/systemd/system-preset' -udevlibexecdir = rootprefixdir + '/lib/udev' -udevhomedir = udevlibexecdir + '' -udevrulesdir = udevlibexecdir + '/rules.d' -udevhwdbdir = udevlibexecdir + '/hwdb.d' -catalogdir = prefixdir + '/lib/systemd/catalog' -kernelinstalldir = prefixdir + '/lib/kernel/install.d' -factorydir = datadir + '/factory' -docdir = datadir + '/doc/systemd' -bootlibdir = prefixdir + '/lib/systemd/boot/efi' -testsdir = prefixdir + '/lib/systemd/tests' -systemdstatedir = localstatedir + '/lib/systemd' -catalogstatedir = systemdstatedir + '/catalog' -randomseeddir = localstatedir + '/lib/systemd' +pkgdatadir = join_paths(datadir, 'systemd') +environmentdir = join_paths(prefixdir, 'lib/environment.d') +pkgsysconfdir = join_paths(sysconfdir, 'systemd') +userunitdir = join_paths(prefixdir, 'lib/systemd/user') +userpresetdir = join_paths(prefixdir, 'lib/systemd/user-preset') +tmpfilesdir = join_paths(prefixdir, 'lib/tmpfiles.d') +sysusersdir = join_paths(prefixdir, 'lib/sysusers.d') +sysctldir = join_paths(prefixdir, 'lib/sysctl.d') +binfmtdir = join_paths(prefixdir, 'lib/binfmt.d') +modulesloaddir = join_paths(prefixdir, 'lib/modules-load.d') +networkdir = join_paths(rootprefixdir, 'lib/systemd/network') +pkgincludedir = join_paths(includedir, 'systemd') +systemgeneratordir = join_paths(rootlibexecdir, 'system-generators') +usergeneratordir = join_paths(prefixdir, 'lib/systemd/user-generators') +systemenvgeneratordir = join_paths(prefixdir, 'lib/systemd/system-environment-generators') +userenvgeneratordir = join_paths(prefixdir, 'lib/systemd/user-environment-generators') +systemshutdowndir = join_paths(rootlibexecdir, 'system-shutdown') +systemsleepdir = join_paths(rootlibexecdir, 'system-sleep') +systemunitdir = join_paths(rootprefixdir, 'lib/systemd/system') +systempresetdir = join_paths(rootprefixdir, 'lib/systemd/system-preset') +udevlibexecdir = join_paths(rootprefixdir, 'lib/udev') +udevhomedir = udevlibexecdir +udevrulesdir = join_paths(udevlibexecdir, 'rules.d') +udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') +catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') +kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') +factorydir = join_paths(datadir, 'factory') +docdir = join_paths(datadir, 'doc/systemd') +bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') +testsdir = join_paths(prefixdir, 'lib/systemd/tests') +systemdstatedir = join_paths(localstatedir, 'lib/systemd') +catalogstatedir = join_paths(systemdstatedir, 'catalog') +randomseeddir = join_paths(localstatedir, 'lib/systemd') dbuspolicydir = get_option('dbuspolicydir') if dbuspolicydir == '' - dbuspolicydir = datadir + '/dbus-1/system.d' + dbuspolicydir = join_paths(datadir, 'dbus-1/system.d') endif dbussessionservicedir = get_option('dbussessionservicedir') if dbussessionservicedir == '' - dbussessionservicedir = datadir + '/dbus-1/services' + dbussessionservicedir = join_paths(datadir, 'dbus-1/services') endif dbussystemservicedir = get_option('dbussystemservicedir') if dbussystemservicedir == '' - dbussystemservicedir = datadir + '/dbus-1/system-services' + dbussystemservicedir = join_paths(datadir, 'dbus-1/system-services') endif pamlibdir = get_option('pamlibdir') if pamlibdir == '' - pamlibdir = rootlibdir + '/security' + pamlibdir = join_paths(rootlibdir, 'security') endif pamconfdir = get_option('pamconfdir') if pamconfdir == '' - pamconfdir = sysconfdir + '/pam.d' + pamconfdir = join_paths(sysconfdir, 'pam.d') endif conf.set_quoted('PKGSYSCONFDIR', pkgsysconfdir) -conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', pkgsysconfdir + '/system') +conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', join_paths(pkgsysconfdir, 'system')) conf.set_quoted('SYSTEM_DATA_UNIT_PATH', systemunitdir) conf.set_quoted('SYSTEM_SYSVINIT_PATH', sysvinit_path) conf.set_quoted('SYSTEM_SYSVRCND_PATH', sysvrcnd_path) conf.set_quoted('RC_LOCAL_SCRIPT_PATH_START', get_option('rc-local')) conf.set_quoted('RC_LOCAL_SCRIPT_PATH_STOP', get_option('halt-local')) -conf.set_quoted('USER_CONFIG_UNIT_PATH', pkgsysconfdir + '/user') +conf.set_quoted('USER_CONFIG_UNIT_PATH', join_paths(pkgsysconfdir, 'user')) conf.set_quoted('USER_DATA_UNIT_PATH', userunitdir) conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root')) -conf.set_quoted('CATALOG_DATABASE', catalogstatedir + '/database') -conf.set_quoted('SYSTEMD_CGROUP_AGENT_PATH', rootlibexecdir + '/systemd-cgroups-agent') -conf.set_quoted('SYSTEMD_BINARY_PATH', rootlibexecdir + '/systemd') -conf.set_quoted('SYSTEMD_FSCK_PATH', rootlibexecdir + '/systemd-fsck') -conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH', rootlibexecdir + '/systemd-shutdown') -conf.set_quoted('SYSTEMD_SLEEP_BINARY_PATH', rootlibexecdir + '/systemd-sleep') -conf.set_quoted('SYSTEMCTL_BINARY_PATH', rootbindir + '/systemctl') -conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', rootbindir + '/systemd-tty-ask-password-agent') -conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH', bindir + '/systemd-stdio-bridge') +conf.set_quoted('CATALOG_DATABASE', join_paths(catalogstatedir, 'database')) +conf.set_quoted('SYSTEMD_CGROUP_AGENT_PATH', join_paths(rootlibexecdir, 'systemd-cgroups-agent')) +conf.set_quoted('SYSTEMD_BINARY_PATH', join_paths(rootlibexecdir, 'systemd')) +conf.set_quoted('SYSTEMD_FSCK_PATH', join_paths(rootlibexecdir, 'systemd-fsck')) +conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH', join_paths(rootlibexecdir, 'systemd-shutdown')) +conf.set_quoted('SYSTEMD_SLEEP_BINARY_PATH', join_paths(rootlibexecdir, 'systemd-sleep')) +conf.set_quoted('SYSTEMCTL_BINARY_PATH', join_paths(rootbindir, 'systemctl')) +conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent')) +conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH', join_paths(bindir, 'systemd-stdio-bridge')) conf.set_quoted('ROOTPREFIX', rootprefixdir) conf.set_quoted('RANDOM_SEED_DIR', randomseeddir) -conf.set_quoted('RANDOM_SEED', randomseeddir + '/random-seed') -conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH', rootlibexecdir + '/systemd-cryptsetup') +conf.set_quoted('RANDOM_SEED', join_paths(randomseeddir, 'random-seed')) +conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH', join_paths(rootlibexecdir, 'systemd-cryptsetup')) conf.set_quoted('SYSTEM_GENERATOR_PATH', systemgeneratordir) conf.set_quoted('USER_GENERATOR_PATH', usergeneratordir) conf.set_quoted('SYSTEM_ENV_GENERATOR_PATH', systemenvgeneratordir) conf.set_quoted('USER_ENV_GENERATOR_PATH', userenvgeneratordir) conf.set_quoted('SYSTEM_SHUTDOWN_PATH', systemshutdowndir) conf.set_quoted('SYSTEM_SLEEP_PATH', systemsleepdir) -conf.set_quoted('SYSTEMD_KBD_MODEL_MAP', pkgdatadir + '/kbd-model-map') -conf.set_quoted('SYSTEMD_LANGUAGE_FALLBACK_MAP', pkgdatadir + '/language-fallback-map') +conf.set_quoted('SYSTEMD_KBD_MODEL_MAP', join_paths(pkgdatadir, 'kbd-model-map')) +conf.set_quoted('SYSTEMD_LANGUAGE_FALLBACK_MAP', join_paths(pkgdatadir, 'language-fallback-map')) conf.set_quoted('UDEVLIBEXECDIR', udevlibexecdir) -conf.set_quoted('POLKIT_AGENT_BINARY_PATH', bindir + '/pkttyagent') +conf.set_quoted('POLKIT_AGENT_BINARY_PATH', join_paths(bindir, 'pkttyagent')) conf.set_quoted('LIBDIR', libdir) conf.set_quoted('ROOTLIBDIR', rootlibdir) conf.set_quoted('ROOTLIBEXECDIR', rootlibexecdir) conf.set_quoted('BOOTLIBDIR', bootlibdir) -conf.set_quoted('SYSTEMD_PULL_PATH', rootlibexecdir + '/systemd-pull') -conf.set_quoted('SYSTEMD_IMPORT_PATH', rootlibexecdir + '/systemd-import') -conf.set_quoted('SYSTEMD_EXPORT_PATH', rootlibexecdir + '/systemd-export') -conf.set_quoted('VENDOR_KEYRING_PATH', rootlibexecdir + '/import-pubring.gpg') -conf.set_quoted('USER_KEYRING_PATH', pkgsysconfdir + '/import-pubring.gpg') -conf.set_quoted('DOCUMENT_ROOT', pkgdatadir + '/gatewayd') +conf.set_quoted('SYSTEMD_PULL_PATH', join_paths(rootlibexecdir, 'systemd-pull')) +conf.set_quoted('SYSTEMD_IMPORT_PATH', join_paths(rootlibexecdir, 'systemd-import')) +conf.set_quoted('SYSTEMD_EXPORT_PATH', join_paths(rootlibexecdir, 'systemd-export')) +conf.set_quoted('VENDOR_KEYRING_PATH', join_paths(rootlibexecdir, 'import-pubring.gpg')) +conf.set_quoted('USER_KEYRING_PATH', join_paths(pkgsysconfdir, 'import-pubring.gpg')) +conf.set_quoted('DOCUMENT_ROOT', join_paths(pkgdatadir, 'gatewayd')) conf.set_quoted('ABS_BUILD_DIR', meson.build_root()) conf.set_quoted('ABS_SRC_DIR', meson.source_root()) @@ -212,8 +212,8 @@ substs.set('systemshutdowndir', systemshutdowndir) substs.set('systemsleepdir', systemsleepdir) substs.set('VARLOGDIR', varlogdir) substs.set('CERTIFICATEROOT', get_option('certificate-root')) -substs.set('SYSTEMCTL', rootbindir + '/systemctl') -substs.set('RANDOM_SEED', randomseeddir + '/random-seed') +substs.set('SYSTEMCTL', join_paths(rootbindir, 'systemctl')) +substs.set('RANDOM_SEED', join_paths(randomseeddir, 'random-seed')) substs.set('SYSTEM_SYSVINIT_PATH', sysvinit_path) substs.set('SYSTEM_SYSVRCND_PATH', sysvrcnd_path) substs.set('RC_LOCAL_SCRIPT_PATH_START', get_option('rc-local')) @@ -1206,8 +1206,8 @@ if conf.get('ENABLE_ENVIRONMENT_D', 0) == 1 install_dir : userenvgeneratordir) meson.add_install_script(meson_make_symlink, - sysconfdir + '/environment', - environmentdir + '/99-environment.conf') + join_paths(sysconfdir, 'environment'), + join_paths(environmentdir, '99-environment.conf')) endif if conf.get('ENABLE_HIBERNATE', 0) == 1 @@ -1689,7 +1689,7 @@ if conf.get('ENABLE_BINFMT', 0) == 1 meson.add_install_script('sh', '-c', mkdir_p.format(binfmtdir)) meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/binfmt.d')) + mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) endif if conf.get('ENABLE_VCONSOLE', 0) == 1 @@ -1893,7 +1893,7 @@ executable('systemd-mount', install : true) meson.add_install_script(meson_make_symlink, - 'systemd-mount', bindir + '/systemd-umount') + 'systemd-mount', join_paths(bindir, 'systemd-umount')) executable('systemd-run', 'src/run/run.c', @@ -2044,7 +2044,7 @@ if conf.get('HAVE_KMOD', 0) == 1 meson.add_install_script('sh', '-c', mkdir_p.format(modulesloaddir)) meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/modules-load.d')) + mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) endif executable('systemd-nspawn', diff --git a/network/meson.build b/network/meson.build index d2eb89ad4d..d36aadb9da 100644 --- a/network/meson.build +++ b/network/meson.build @@ -8,5 +8,5 @@ if conf.get('ENABLE_NETWORKD', 0) == 1 install_dir : networkdir) meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/systemd/network')) + mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) endif diff --git a/po/meson.build b/po/meson.build index b95c2a3550..c3976b3846 100644 --- a/po/meson.build +++ b/po/meson.build @@ -8,7 +8,7 @@ i18n.gettext(meson.project_name()) intltool_merge = find_program('intltool-merge') po_dir = meson.current_source_dir() -intltool_cache = meson.current_build_dir() + '/intltool-merge-cache' +intltool_cache = join_paths(meson.current_build_dir(), 'intltool-merge-cache') intltool_command = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@'] diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index bbd705c1cf..07de1d232a 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -6,7 +6,7 @@ if bashcompletiondir == '' if bash_completion.found() bashcompletiondir = bash_completion.get_pkgconfig_variable('completionsdir') else - bashcompletiondir = datadir + '/bash-completion/completions' + bashcompletiondir = join_paths(datadir, 'bash-completion/completions') endif message('bash completions: @0@'.format(bashcompletiondir)) diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build index 56bf7aeb03..0ba4136496 100644 --- a/shell-completion/zsh/meson.build +++ b/shell-completion/zsh/meson.build @@ -2,7 +2,7 @@ zshcompletiondir = get_option('zshcompletiondir') if zshcompletiondir == '' - zshcompletiondir = datadir + '/zsh/site-functions' + zshcompletiondir = join_paths(datadir, 'zsh/site-functions') message('zsh completions: @0@'.format(zshcompletiondir)) endif diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index 858dd4a870..7e0c626f28 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -70,7 +70,7 @@ if have_gnu_efi efi_ldsdir = get_option('efi-ldsdir') if efi_ldsdir == '' - efi_ldsdir = efi_libdir + '/gnuefi' + efi_ldsdir = join_paths(efi_libdir, 'gnuefi') endif efi_incdir = get_option('efi-includedir') @@ -92,7 +92,7 @@ if have_gnu_efi '-Wsign-compare', '-Wno-missing-field-initializers', '-isystem', efi_incdir, - '-isystem', efi_incdir + '/' + efi_arch, + '-isystem', join_paths(efi_incdir, efi_arch), '-include', efi_config_h] if efi_arch == 'x86_64' compile_args += ['-mno-red-zone', diff --git a/src/core/meson.build b/src/core/meson.build index 97410a8cc4..a06c9414d1 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -227,10 +227,10 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) meson.add_install_script('sh', '-c', - mkdir_p.format(pkgsysconfdir + '/system/multi-user.target.wants')) + mkdir_p.format(join_paths(pkgsysconfdir, 'system/multi-user.target.wants'))) meson.add_install_script('sh', '-c', - mkdir_p.format(pkgsysconfdir + '/system/getty.target.wants')) + mkdir_p.format(join_paths(pkgsysconfdir, 'system/getty.target.wants'))) meson.add_install_script('sh', '-c', - mkdir_p.format(pkgsysconfdir + '/user')) + mkdir_p.format(join_paths(pkgsysconfdir, 'user'))) meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/xdg/systemd')) + mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd'))) diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index ca05390244..35342755d3 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -42,7 +42,7 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 endif install_data('browse.html', - install_dir : pkgdatadir + '/gatewayd') + install_dir : join_paths(pkgdatadir, 'gatewayd')) meson.add_install_script('sh', '-c', mkdir_p.format('/var/log/journal/remote')) diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build index 4ecea20f89..3e2d2e587c 100644 --- a/src/kernel-install/meson.build +++ b/src/kernel-install/meson.build @@ -10,4 +10,4 @@ install_data('50-depmod.install', install_dir : kernelinstalldir) meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/kernel/install.d')) + mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) diff --git a/src/locale/meson.build b/src/locale/meson.build index 775ad2ce77..8bd22fe321 100644 --- a/src/locale/meson.build +++ b/src/locale/meson.build @@ -26,8 +26,8 @@ endif # If you know a way that allows the same variables to be used # in sources list and concatenated to a string for test_env, # let me know. -kbd_model_map = meson.current_source_dir() + '/kbd-model-map' -language_fallback_map = meson.current_source_dir() + '/language-fallback-map' +kbd_model_map = join_paths(meson.current_source_dir(), 'kbd-model-map') +language_fallback_map = join_paths(meson.current_source_dir(), 'language-fallback-map') install_data('kbd-model-map', 'language-fallback-map', diff --git a/src/udev/meson.build b/src/udev/meson.build index fdd73046dc..19dc522172 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -161,7 +161,7 @@ executable('mtd_probe', install_dir : udevlibexecdir) install_data('udev.conf', - install_dir : sysconfdir + '/udev') + install_dir : join_paths(sysconfdir, 'udev')) udev_pc = configure_file( input : 'udev.pc.in', @@ -171,4 +171,4 @@ install_data(udev_pc, install_dir : pkgconfigdatadir) meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/udev/rules.d')) + mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d'))) diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build index cdd95f857a..826542debc 100644 --- a/sysctl.d/meson.build +++ b/sysctl.d/meson.build @@ -20,4 +20,4 @@ foreach file : in_files endforeach meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/sysctl.d')) + mkdir_p.format(join_paths(sysconfdir, 'sysctl.d'))) diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index 36a053bc0e..eebdbb9501 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -40,5 +40,5 @@ endforeach if enable_tmpfiles meson.add_install_script('sh', '-c', - mkdir_p.format(sysconfdir + '/tmpfiles.d')) + mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d'))) endif diff --git a/units/meson.build b/units/meson.build index 44bfda4a82..e49a293ba9 100644 --- a/units/meson.build +++ b/units/meson.build @@ -32,7 +32,7 @@ units = [ ['local-fs.target', ''], ['machine.slice', 'ENABLE_MACHINED'], ['machines.target', 'ENABLE_MACHINED', - pkgsysconfdir + '/system/multi-user.target.wants/'], + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], ['multi-user.target', '', 'runlevel2.target runlevel3.target runlevel4.target'], ['network-online.target', ''], @@ -51,7 +51,7 @@ units = [ 'runlevel6.target ctrl-alt-del.target'], ['remote-fs-pre.target', ''], ['remote-fs.target', '', - pkgsysconfdir + '/system/multi-user.target.wants/'], + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], ['rescue.target', '', 'runlevel1.target'], ['rpcbind.target', ''], @@ -91,7 +91,7 @@ units = [ ['systemd-journald.socket', '', 'sockets.target.wants/'], ['systemd-networkd.socket', '', - pkgsysconfdir + '/system/sockets.target.wants/'], + join_paths(pkgsysconfdir, 'system/sockets.target.wants/')], ['systemd-rfkill.socket', 'ENABLE_RFKILL'], ['systemd-tmpfiles-clean.timer', '', 'timers.target.wants/'], @@ -164,7 +164,7 @@ in_units = [ ['systemd-modules-load.service', 'HAVE_KMOD', 'sysinit.target.wants/'], ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD', - pkgsysconfdir + '/system/network-online.target.wants/'], + join_paths(pkgsysconfdir, 'system/network-online.target.wants/')], ['systemd-nspawn@.service', ''], ['systemd-poweroff.service', ''], ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], @@ -182,7 +182,7 @@ in_units = [ ['systemd-timedated.service', 'ENABLE_TIMEDATED', 'dbus-org.freedesktop.timedate1.service'], ['systemd-timesyncd.service', 'ENABLE_TIMESYNCD', - pkgsysconfdir + '/system/sysinit.target.wants/'], + join_paths(pkgsysconfdir, 'system/sysinit.target.wants/')], ['systemd-tmpfiles-clean.service', 'ENABLE_TMPFILES'], ['systemd-tmpfiles-setup-dev.service', 'ENABLE_TMPFILES', 'sysinit.target.wants/'], @@ -208,7 +208,7 @@ in_units = [ m4_units = [ ['getty@.service', '', 'autovt@.service ' + - pkgsysconfdir + '/system/getty.target.wants/getty@tty1.service'], + join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')], ['serial-getty@.service', ''], ['tmp.mount', '', 'local-fs.target.wants/'], @@ -219,10 +219,10 @@ m4_in_units = [ ['container-getty@.service', ''], ['systemd-networkd.service', 'ENABLE_NETWORKD', 'dbus-org.freedesktop.network1.service ' + - pkgsysconfdir + '/system/multi-user.target.wants/ '], + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], ['systemd-resolved.service', 'ENABLE_RESOLVED', 'dbus-org.freedesktop.resolve1.service ' + - pkgsysconfdir + '/system/multi-user.target.wants/'], + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], ['user@.service', ''], ] @@ -313,16 +313,16 @@ endforeach ############################################################ meson.add_install_script(meson_make_symlink, - pkgsysconfdir + '/user', - sysconfdir + '/xdg/systemd/user') + join_paths(pkgsysconfdir, 'user'), + join_paths(sysconfdir, 'xdg/systemd/user')) meson.add_install_script(meson_make_symlink, - dbussystemservicedir + '/org.freedesktop.systemd1.service', - dbussessionservicedir + '/org.freedesktop.systemd1.service') + join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), + join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) if conf.get('HAVE_SYSV_COMPAT', 0) == 1 foreach i : [1, 2, 3, 4, 5] meson.add_install_script('sh', '-c', mkdir_p - .format(systemunitdir + '/runlevel@0@.target.wants'.format(i))) + .format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i)))) endforeach endif