summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-01-28 15:31:09 +0100
committerinfirit <[email protected]>2014-01-28 15:31:09 +0100
commite0f3ca5b61ee407ca97a261e2b4aeb9533343f4f (patch)
tree2068d0851f4854662d5c0baca1288c5f8fd293a2
parentdd014d6f6438710fdec6deced68633bbd9973eb0 (diff)
downloadmozo-e0f3ca5b61ee407ca97a261e2b4aeb9533343f4f.tar.bz2
mozo-e0f3ca5b61ee407ca97a261e2b4aeb9533343f4f.tar.xz
Fix distcheck: Add option to disable icon cache.
-rw-r--r--Makefile.am2
-rw-r--r--data/icons/Makefile.am4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index c1a6956..1d7a1ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,8 @@ CLEANFILES += mozo
DISTCLEANFILES = ChangeLog
+DISTCHECK_CONFIGURE_FLAGS = --disable-icon-update
+
mozo: mozo.in
sed -e s!\@PYTHON\@!@PYTHON@! \
-e s!\@PYOPTIONS\@!-OOt! \
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index c5d7580..4819879 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -27,10 +27,10 @@ EXTRA_DIST = \
###############################################################################
-gtk_update_icon_cache = gtk-update-icon-cache -f -t
+gtk_update_icon_cache = $(UPDATE_ICON_CACHE) -f -t
update-icon-cache:
- @-if test -z "$(DESTDIR)"; then \
+ @-if test -z "$(DESTDIR)" && ICON_UPDATE; then \
echo "Updating Gtk icon cache."; \
for theme in $(public_icons_themes); do \
$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \