summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorLogan Rathbone <poprocks@gmail.com>2021-06-29 03:31:56 +0000
committerLogan Rathbone <poprocks@gmail.com>2021-06-29 03:31:56 +0000
commitdc76b407e517bafb62f0a8c2cb5dc2df5723c4c6 (patch)
tree20e5f1389ffed3b6d643daab199d9877700c119a /data
parentUpdate Russian translation (diff)
parentUpdate Russian translation (diff)
downloadzenity-dc76b407e517bafb62f0a8c2cb5dc2df5723c4c6.tar.gz
zenity-dc76b407e517bafb62f0a8c2cb5dc2df5723c4c6.tar.bz2
zenity-dc76b407e517bafb62f0a8c2cb5dc2df5723c4c6.zip
Merge branch 'meson' into 'master'
Port build system to meson See merge request GNOME/zenity!14
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am23
-rw-r--r--data/meson.build22
2 files changed, 22 insertions, 23 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index cc185118..00000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-clothesdir = $(datadir)/zenity/clothes
-clothes_DATA = \
- monk.png \
- gnome-tshirt.png \
- sunglasses.png \
- surfboard.png \
- hawaii-shirt.png
-
-imagesdir = $(datadir)/zenity
-images_DATA = \
- zenity.png \
- zenity-calendar.png \
- zenity-list.png \
- zenity-file.png \
- zenity-progress.png \
- zenity-text.png \
- zenity-scale.png \
- zenity-entry.png \
- zenity-notification.png
-
-man_MANS = zenity.1
-
-EXTRA_DIST = $(images_DATA) $(clothes_DATA) $(man_MANS)
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 00000000..373efcf4
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,22 @@
+install_man('zenity.1')
+
+install_data(
+ ['zenity.png',
+ 'zenity-calendar.png',
+ 'zenity-list.png',
+ 'zenity-file.png',
+ 'zenity-progress.png',
+ 'zenity-text.png',
+ 'zenity-scale.png',
+ 'zenity-entry.png',
+ 'zenity-notification.png']
+ )
+
+install_data(
+ ['monk.png',
+ 'gnome-tshirt.png',
+ 'sunglasses.png',
+ 'surfboard.png',
+ 'hawaii-shirt.png'],
+ install_dir: join_paths(zenity_datadir, 'clothes')
+ )
bgstack15