[frogr] meson: Simplify rule to install UI files
- From: Mario Sanchez Prada <msanchez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [frogr] meson: Simplify rule to install UI files
- Date: Wed, 24 May 2017 06:04:09 +0000 (UTC)
commit 8f5de076474a34d03265c83051ad6dd9e68a402a
Author: Mario Sanchez Prada <msanchez gnome org>
Date: Wed May 24 06:56:08 2017 +0100
meson: Simplify rule to install UI files
I misread the meson documentation and understood that $datadir/frogr
would get deleted if using install_subdirs() for this, but it turns
out that it would be $datadir/frogr/gtkbuilder instead, and so there
is no problem on using install_subdirs().
Therefore, use that rule instead and simplify these lines.
data/meson.build | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index c103ec7..acbb83b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,29 +1,19 @@
+frogrdir = join_paths (datadir, project_name)
+
# Icons
icondir = join_paths (datadir, 'icons')
install_subdir ('icons/hicolor',
install_dir: icondir)
# Images
-imagesdir = join_paths (datadir, project_name, 'images')
+imagesdir = join_paths (frogrdir, 'images')
install_data(join_paths('images', 'mpictures.png'),
install_dir : imagesdir)
# UI Files
-gtkbuilderdir = join_paths (datadir, project_name, 'gtkbuilder')
-gtkbuilder_files = [
- 'gtkbuilder/frogr-main-view.ui',
- 'gtkbuilder/frogr-app-menu.ui',
- 'gtkbuilder/frogr-context-menu.ui',
- 'gtkbuilder/frogr-menu-button.ui',
- 'gtkbuilder/frogr-menu-bar.ui'
-]
-
-# We can't use install_subdir() for this because it would delete
-# the 'DATADIR/frogr' before copying, which is not what we want.
-foreach ui_file : gtkbuilder_files
- install_data(ui_file,
- install_dir : gtkbuilderdir)
-endforeach
+gtkbuilderdir = join_paths (frogrdir, 'gtkbuilder')
+install_subdir ('gtkbuilder',
+ install_dir: frogrdir)
# Man pages
mandir = join_paths (datadir, project_name, 'man')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]