[gnome-bluetooth] meson: Fix installing the icons

[Bastien Nocera <hadess src gnome org>]

commit f69fa83e95e0d2a1428efbb29f24c87e3e2f5966
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date:   Fri Sep 15 15:18:19 2017 +0200

    meson: Fix installing the icons
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787728

 .../16x16/apps/bluetooth.png}                      |  Bin 725 -> 725 bytes
 .../16x16/status/bluetooth-active.png}             |  Bin 787 -> 787 bytes
 .../16x16/status/bluetooth-disabled.png}           |  Bin 784 -> 784 bytes
 .../16x16/status/bluetooth-paired.png}             |  Bin 714 -> 714 bytes
 .../22x22/apps/bluetooth.png}                      |  Bin 994 -> 994 bytes
 .../22x22/status/bluetooth-active.png}             |  Bin 1064 -> 1064 bytes
 .../22x22/status/bluetooth-disabled.png}           |  Bin 1108 -> 1108 bytes
 .../22x22/status/bluetooth-paired.png}             |  Bin 1126 -> 1126 bytes
 .../24x24/apps/bluetooth.png}                      |  Bin 1023 -> 1023 bytes
 .../24x24/status/bluetooth-active.png}             |  Bin 1064 -> 1064 bytes
 .../24x24/status/bluetooth-disabled.png}           |  Bin 1123 -> 1123 bytes
 .../24x24/status/bluetooth-paired.png}             |  Bin 1128 -> 1128 bytes
 .../32x32/apps/bluetooth.png}                      |  Bin 1970 -> 1970 bytes
 .../32x32/status/bluetooth-active.png}             |  Bin 2018 -> 2018 bytes
 .../32x32/status/bluetooth-disabled.png}           |  Bin 2169 -> 2169 bytes
 .../32x32/status/bluetooth-paired.png}             |  Bin 1985 -> 1985 bytes
 .../48x48/apps/bluetooth.png}                      |  Bin 3004 -> 3004 bytes
 .../48x48/status/bluetooth-active.png}             |  Bin 3143 -> 3143 bytes
 .../48x48/status/bluetooth-disabled.png}           |  Bin 3345 -> 3345 bytes
 .../scalable/apps/bluetooth.svg}                   |    0
 .../scalable/status/bluetooth-paired.svg}          |    0
 icons/meson.build                                  |   36 +-------------------
 meson.build                                        |    2 +-
 23 files changed, 2 insertions(+), 36 deletions(-)
---
diff --git a/icons/hicolor_apps_scalable_bluetooth.svg b/icons/hicolor/scalable/apps/bluetooth.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_bluetooth.svg
rename to icons/hicolor/scalable/apps/bluetooth.svg
diff --git a/icons/hicolor_status_scalable_bluetooth-paired.svg 
b/icons/hicolor/scalable/status/bluetooth-paired.svg
similarity index 100%
rename from icons/hicolor_status_scalable_bluetooth-paired.svg
rename to icons/hicolor/scalable/status/bluetooth-paired.svg
diff --git a/icons/meson.build b/icons/meson.build
index 98690ee..f60a088 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -1,35 +1 @@
-icons_files = [
-  ['apps', 'bluetooth.png'],
-  ['status', 'bluetooth-active.png'],
-  ['status', 'bluetooth-disabled.png'],
-  ['status', 'bluetooth-paired.png']
-]
-
-icons_48x48_files = [
-  ['apps', 'bluetooth.png'],
-  ['status', 'bluetooth-active.png'],
-  ['status', 'bluetooth-disabled.png']
-]
-
-icons_scalable_files = [
-  ['apps', 'bluetooth.svg'],
-  ['status', 'bluetooth-paired.svg']
-]
-
-icons = [
-  ['16x16', icons_files],
-  ['22x22', icons_files],
-  ['24x24', icons_files],
-  ['32x32', icons_files],
-  ['48x48', icons_48x48_files],
-  ['scalable', icons_scalable_files]
-]
-
-foreach icon: icons
-  foreach icon_file: icon[1]
-    install_data(
-      '_'.join(['hicolor', icon_file[0], icon[0], icon_file[1]]),
-      install_dir: join_paths(gnomebt_icondir, icon[0], icon_file[0])
-    )
-  endforeach
-endforeach
+install_subdir('hicolor', install_dir: gnomebt_icondir)
diff --git a/meson.build b/meson.build
index 6fceb80..236e480 100644
--- a/meson.build
+++ b/meson.build
@@ -35,7 +35,7 @@ gnomebt_mandir = join_paths(gnomebt_prefix, get_option('mandir'))
 gnomebt_pkgdatadir = join_paths(gnomebt_datadir, meson.project_name())
 gnomebt_pkglibdir = join_paths(gnomebt_libdir, meson.project_name())
 
-gnomebt_icondir = join_paths(gnomebt_datadir, 'icons', 'hicolor')
+gnomebt_icondir = join_paths(gnomebt_datadir, 'icons')
 
 gnomebt_buildtype = get_option('buildtype')
 gnomebt_debug = gnomebt_buildtype.contains('debug')