gnome-bluetooth r392 - in trunk: . icons

[hadess svn gnome org]

Author: hadess
Date: Fri Feb 27 16:37:49 2009
New Revision: 392
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=392&view=rev

Log:
Run the icon cache update from the icons dir

And not the top-level.

Modified:
   trunk/Makefile.am
   trunk/icons/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Feb 27 16:37:49 2009
@@ -19,9 +19,6 @@
 pkgconfig_DATA = gnome-bluetooth-1.0.pc
 
 install-data-hook:
-if ICON_UPDATE
-	$(UPDATE_ICON_CACHE) -f -t $(DESTDIR)$(datadir)/icons/hicolor
-endif
 if MIME_UPDATE
 	$(UPDATE_MIME_DATABASE) $(DESTDIR)$(datadir)/mime
 endif
@@ -30,9 +27,6 @@
 endif
 
 uninstall-hook:
-if ICON_UPDATE
-	$(UPDATE_ICON_CACHE) $(DESTDIR)$(datadir)/icons/hicolor
-endif
 if MIME_UPDATE
 	$(UPDATE_MIME_DATABASE) $(DESTDIR)$(datadir)/mime
 endif

Modified: trunk/icons/Makefile.am
==============================================================================
--- trunk/icons/Makefile.am	(original)
+++ trunk/icons/Makefile.am	Fri Feb 27 16:37:49 2009
@@ -37,3 +37,14 @@
 		FILE=`echo $$i | cut -d_ -f4`; \
 		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$FILE; \
 	done
+
+install-data-hook:
+if ICON_UPDATE
+	$(UPDATE_ICON_CACHE) -f -t $(DESTDIR)$(datadir)/icons/hicolor
+endif
+
+uninstall-hook:
+if ICON_UPDATE
+	$(UPDATE_ICON_CACHE) $(DESTDIR)$(datadir)/icons/hicolor
+endif
+