[gnome-control-center: 1/2] build: Fix app icon install

[Jeremy Bicha <jbicha src gnome org>]

commit 29b3a93f765e0ec15879a26ba67e30f779abda4e
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sat Feb 17 11:37:31 2018 -0500

    build: Fix app icon install

 .../16x16/apps/gnome-control-center.png}           | Bin
 .../24x24/apps/gnome-control-center.png}           | Bin
 .../32x32/apps/gnome-control-center.png}           | Bin
 .../48x48/apps/gnome-control-center.png}           | Bin
 .../512x512/apps/gnome-control-center.png}         | Bin
 .../apps/gnome-control-center-symbolic.svg}        |   0
 data/icons/meson.build                             |  21 +++------------------
 7 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/data/icons/hicolor_apps_16x16_gnome-control-center.png 
b/data/icons/hicolor/16x16/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_16x16_gnome-control-center.png
rename to data/icons/hicolor/16x16/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_24x24_gnome-control-center.png 
b/data/icons/hicolor/24x24/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_24x24_gnome-control-center.png
rename to data/icons/hicolor/24x24/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_32x32_gnome-control-center.png 
b/data/icons/hicolor/32x32/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_32x32_gnome-control-center.png
rename to data/icons/hicolor/32x32/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_48x48_gnome-control-center.png 
b/data/icons/hicolor/48x48/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_48x48_gnome-control-center.png
rename to data/icons/hicolor/48x48/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_512x512_gnome-control-center.png 
b/data/icons/hicolor/512x512/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_512x512_gnome-control-center.png
rename to data/icons/hicolor/512x512/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg 
b/data/icons/hicolor/scalable/apps/gnome-control-center-symbolic.svg
similarity index 100%
rename from data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg
rename to data/icons/hicolor/scalable/apps/gnome-control-center-symbolic.svg
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 56fa96791..0f9a7eb54 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,19 +1,4 @@
-icon_sizes = [
-  '16x16',
-  '24x24',
-  '32x32',
-  '48x48',
-  '512x512'
-]
-
-foreach icon_size: icon_sizes
-  install_data(
-    '_'.join(['hicolor', 'apps', icon_size, 'gnome-control-center.png']),
-    install_dir: join_paths(control_center_icondir, 'hicolor', icon_size, 'apps')
-  )
-endforeach
-
-install_data(
-  'hicolor_apps_symbolic_gnome-control-center-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'symbolic', 'apps')
+install_subdir(
+  'hicolor',
+  install_dir: control_center_icondir
 )