[dia: 81/105] #19 review: Use join_paths to specify icon installation paths.



commit ae2a5149b9294bc7461d1895bead53327e9c0246
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Sat Jan 19 13:37:39 2019 +0000

    #19 review: Use join_paths to specify icon installation paths.
    
      - This is the portable way of doing things.

 data/icons/meson.build | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/data/icons/meson.build b/data/icons/meson.build
index c64563e6..58277f80 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,20 +1,18 @@
-icons_sources = [
-    '16x16/apps/dia.png',
-    '22x22/apps/dia.png',
-    '24x24/apps/dia.png',
-    '32x32/apps/dia.png',
-    '48x48/apps/dia.png',
-    'scalable/apps/dia.svg'
-]
+icon_files = {
+    '16x16': 'dia.png',
+    '22x22': 'dia.png',
+    '24x24': 'dia.png',
+    '32x32': 'dia.png',
+    '48x48': 'dia.png',
+    'scalable': 'dia.svg',
+}
 
 icondir = join_paths(datadir, 'icons', 'hicolor')
 
 # Remember to call gtk-update-icon-cache when installing / uninstalling.
-
-# It would be nice if install_subdir allowed selecting files.
-foreach icon : icons_sources
-    rel_path = icon.split('/')
-    install_data(icon, install_dir : join_paths(icondir,
-                                                rel_path[0],
-                                                rel_path[1]))
+foreach size, file : icon_files
+    install_data(
+        join_paths(size, 'apps', file),
+        install_dir: join_paths(icondir, size, 'apps')
+    )
 endforeach


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]