[rhythmbox/wip/sam/meson] Apply 7 suggestion(s) to 4 file(s)
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/wip/sam/meson] Apply 7 suggestion(s) to 4 file(s)
- Date: Tue, 19 Oct 2021 13:28:04 +0000 (UTC)
commit e7e82f4c30b16cd635d19450f645bb1e8836f96d
Author: Emmanuele Bassi <ebassi gmail com>
Date: Tue Oct 19 13:28:03 2021 +0000
Apply 7 suggestion(s) to 4 file(s)
data/meson.build | 6 +++---
doc/reference/meson.build | 2 +-
plugins/context/meson.build | 4 ++--
plugins/fmradio/meson.build | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 0753760df..2c0adbdfb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -16,7 +16,7 @@ foreach desktop_file : desktop_files
output: desktop_file,
po_dir: po_dir,
install: true,
- install_dir: join_paths(datadir, 'applications')
+ install_dir: datadir / 'applications',
)
endforeach
@@ -29,7 +29,7 @@ configure_file(
input: service + '.in',
output: service,
install: true,
- install_dir: join_paths(datadir, 'dbus-1', 'services'),
+ install_dir: datadir / 'dbus-1/services',
configuration: service_conf
)
@@ -64,7 +64,7 @@ appdata_file = i18n.merge_file (
input: appdata + '.in',
output: appdata,
install: true,
- install_dir: join_paths(datadir, 'metainfo'),
+ install_dir: datadir / 'metainfo',
po_dir: po_dir,)
# Validate Appdata
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 438ef7772..f467b4268 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -108,7 +108,7 @@ gnome.gtkdoc(
src_dir: join_paths(meson.source_root(), 'lib'),
gobject_typesfile: join_paths(meson.current_source_dir(), 'rhythmbox.types'),
dependencies: rhythmbox_core_dep,
- scan_args: '--ignore-headers=' + ' '.join(private_headers),
+ ignore_headers: private_headers,
mkdb_args: '--name-space=' + doc_module,
fixxref_args: '--html-dir=' + doc_path,
install: true,
diff --git a/plugins/context/meson.build b/plugins/context/meson.build
index 1e05726c2..888beadde 100644
--- a/plugins/context/meson.build
+++ b/plugins/context/meson.build
@@ -28,7 +28,7 @@ install_data([
'tmpl/links-tmpl.html',
'tmpl/lyrics-tmpl.html',
'tmpl/main.css'],
- install_dir: context_plugin_data_dir + '/tmpl')
+ install_dir: context_plugin_data_dir / 'tmpl')
install_data([
'img/lastfm.png',
@@ -36,4 +36,4 @@ install_data([
'img/links/Allmusic16x16.png',
'img/links/Discogs16x16.png',
'img/links/Wikipedia16x16.png'],
- install_dir: context_plugin_data_dir + '/img')
+ install_dir: context_plugin_data_dir / 'img')
diff --git a/plugins/fmradio/meson.build b/plugins/fmradio/meson.build
index e1a843afb..2aafdb64b 100644
--- a/plugins/fmradio/meson.build
+++ b/plugins/fmradio/meson.build
@@ -1,5 +1,5 @@
-fmradio_plugin_dir = plugindir + '/fmradio'
-fmradio_plugin_data_dir = plugindatadir + '/fmradio'
+fmradio_plugin_dir = plugindir / 'fmradio'
+fmradio_plugin_data_dir = plugindatadir / 'fmradio'
fmradio_resources = gnome.compile_resources('fmradio-resources',
'fmradio.gresource.xml',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]