diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot/efi/meson.build | 4 | ||||
| -rw-r--r-- | src/core/meson.build | 8 | ||||
| -rw-r--r-- | src/journal-remote/meson.build | 2 | ||||
| -rw-r--r-- | src/kernel-install/meson.build | 2 | ||||
| -rw-r--r-- | src/locale/meson.build | 4 | ||||
| -rw-r--r-- | src/udev/meson.build | 4 |
6 files changed, 12 insertions, 12 deletions
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'))) |