[gnome-calculator] Meson: don't forget to install icons.

[Robert Roth <robertroth src gnome org>]

commit c387288d78ef21d09356fed19359af6977213fba
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Jan 27 16:57:49 2018 +0100

    Meson: don't forget to install icons.
    
    Signed-off-by: Niels De Graef <nielsdegraef gmail com>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=792954

 data/icons/Makefile.am                             |   64 +++++++------------
 .../16x16/apps/gnome-calculator.png}               |  Bin 424 -> 424 bytes
 .../22x22/apps/gnome-calculator.png}               |  Bin 595 -> 595 bytes
 .../24x24/apps/gnome-calculator.png}               |  Bin 620 -> 620 bytes
 .../256x256/apps/gnome-calculator.png}             |  Bin 75277 -> 75277 bytes
 .../32x32/apps/gnome-calculator.png}               |  Bin 1640 -> 1640 bytes
 .../48x48/apps/gnome-calculator.png}               |  Bin 1391 -> 1391 bytes
 .../scalable/apps/gnome-calculator-symbolic.svg}   |    0
 data/meson.build                                   |    6 ++
 9 files changed, 30 insertions(+), 40 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index dae54bb..410289b 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -14,16 +14,34 @@ public_icons = \
        hicolor_apps_scalable_gnome-calculator-symbolic.svg \
        $(NULL)
 
-private_icons = \
-       $(NULL)
+icon16dir=$(datadir)/icons/hicolor/16x16/apps
+icon22dir=$(datadir)/icons/hicolor/22x22/apps
+icon24dir=$(datadir)/icons/hicolor/24x24/apps
+icon32dir=$(datadir)/icons/hicolor/32x32/apps
+icon48dir=$(datadir)/icons/hicolor/48x48/apps
+icon256dir=$(datadir)/icons/hicolor/256x256/apps
+iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
+
+icon16_DATA = hicolor/16x16/apps/gnome-calculator.png
+icon22_DATA = hicolor/22x22/apps/gnome-calculator.png
+icon24_DATA = hicolor/24x24/apps/gnome-calculator.png
+icon32_DATA = hicolor/32x32/apps/gnome-calculator.png
+icon48_DATA = hicolor/48x48/apps/gnome-calculator.png
+icon256_DATA = hicolor/256x256/apps/gnome-calculator.png
+iconscalable_DATA = hicolor/scalable/apps/gnome-calculator-symbolic.svg
 
 noinst_DATA = \
        gnome-calculator-src.svg \
        $(NULL)
 
 EXTRA_DIST = \
-       $(public_icons)         \
-       $(private_icons)        \
+       $(icon16_DATA)  \
+       $(icon22_DATA)  \
+       $(icon24_DATA)  \
+       $(icon32_DATA)  \
+       $(icon48_DATA)  \
+       $(icon256_DATA) \
+       $(iconscalable_DATA)    \
        $(noinst_DATA)          \
        $(NULL)
 
@@ -44,42 +62,8 @@ update-icon-cache:
                done; \
        fi
 
-install-icons:
-       for icon in $(public_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done; \
-       for icon in $(private_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done
-
-uninstall-icons:
-       -for icon in $(public_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done; \
-       for icon in $(private_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done
-
-install-data-local: install-icons update-icon-cache
+install-data-local: update-icon-cache
 
-uninstall-local: uninstall-icons update-icon-cache
+uninstall-local: update-icon-cache
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/hicolor_apps_scalable_gnome-calculator-symbolic.svg 
b/data/icons/hicolor/scalable/apps/gnome-calculator-symbolic.svg
similarity index 100%
rename from data/icons/hicolor_apps_scalable_gnome-calculator-symbolic.svg
rename to data/icons/hicolor/scalable/apps/gnome-calculator-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
index 8f806b9..ab96a2b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,9 @@
+# Icons
+install_subdir('icons',
+  install_dir: join_paths(get_option('datadir')),
+  exclude_files: [ 'Makefile', 'Makefile.in', 'Makefile.am', 'gnome-calculator-src.svg' ],
+)
+
 # Desktop file
 i18n.merge_file(
   input: 'org.gnome.Calculator.desktop.in',