From 2c2e0a3dea3d0fb2f0218cda9947a75334a67bde Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Tue, 7 Jun 2016 07:48:06 +0800
Subject: [PATCH] sync

---
 pixmaps/Makefile.am | 50 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index ce4cec6c8..6fe35795b 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,24 +1,52 @@
-
-
+public_icons_themes =  hicolor
 
 iconsdir = $(datadir)/icons/hicolor
 
-nobase_dist_icons_DATA = \
+public_icons = \
     16x16/apps/roobuilder.png \
     22x22/apps/roobuilder.png \
     24x24/apps/roobuilder.png \
     32x32/apps/roobuilder.png \
     48x48/apps/roobuilder.png
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+EXTRA_DIST = \
+	        $(public_icons)
 
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
+
+
+
 update-icon-cache:
-    @-if test -z "$(DESTDIR)"; then \
-        echo "Updating GTK icon cache."; \
-        $(gtk_update_icon_cache); \
-    else \
-        echo "*** Icon cache not updated. After (un)install, run this:"; \
-        echo "*** $(gtk_update_icon_cache)"; \
-    fi
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		for theme in $(public_icons_themes); do \
+			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+		done; \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		for theme in $(public_icons_themes); do \
+			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+		done; \
+	fi
+
+install-icons:
+	for icon in $(public_icons); do \
+		mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$icon; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$icon; \
+	done; 
+	
+
+uninstall-icons:
+	-for icon in $(public_icons); do \
+		rm -f  $(DESTDIR)$(datadir)/icons/hicolor/$$icon; \
+	done;
+	
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache
+
+
-- 
2.39.2