[gnome-hello] build-sys: fix make distcheck
- From: Marc-Andre Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-hello] build-sys: fix make distcheck
- Date: Mon, 22 Dec 2014 15:31:43 +0000 (UTC)
commit cdc1e4293125db5330eba6c79b417036aba7903f
Author: Marc-André Lureau <marcandre lureau gmail com>
Date: Mon Dec 22 16:19:20 2014 +0100
build-sys: fix make distcheck
Update icon-theme.cache on uninstall, based on gtk-demo Makefile.am
pixmaps/Makefile.am | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 49761e0..5a1e04c 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,18 +1,22 @@
-icondir = $(datadir)/icons/hicolor/48x48/apps
+iconthemedir = $(datadir)/icons/hicolor
+
+icondir = $(iconthemedir)/48x48/apps
icon_DATA = gnome-hello-logo.png
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+
+install-data-hook: install-update-icon-cache
+uninstall-hook: uninstall-update-icon-cache
+
+install-update-icon-cache:
+ $(AM_V_at)$(POST_INSTALL)
+ test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+uninstall-update-icon-cache:
+ $(AM_V_at)$(POST_UNINSTALL)
+ test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-install-data-hook:
- @-if test -z "$(DESTDIR)"; then \
- echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache); \
- else \
- echo "*** Icon cache not updated. After install, run this:"; \
- echo "*** $(gtk_update_icon_cache)"; \
- fi
-EXTRA_DIST = \
- $(icon_DATA)
+EXTRA_DIST = $(icon_DATA)
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]