aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.co.uk>2012-07-23 21:43:19 +0800
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-07-23 21:56:00 +0800
commit136088b2686da8dc9fca4e3b77faad28e1a873d1 (patch)
tree3106af4bb55a62467964c19837444fa6eadc8ac7
parent4d3c3a8e211febcbbd71ce451c7eb9cd67eecd85 (diff)
downloadgsoc2013-empathy-136088b2686da8dc9fca4e3b77faad28e1a873d1.tar
gsoc2013-empathy-136088b2686da8dc9fca4e3b77faad28e1a873d1.tar.gz
gsoc2013-empathy-136088b2686da8dc9fca4e3b77faad28e1a873d1.tar.bz2
gsoc2013-empathy-136088b2686da8dc9fca4e3b77faad28e1a873d1.tar.lz
gsoc2013-empathy-136088b2686da8dc9fca4e3b77faad28e1a873d1.tar.xz
gsoc2013-empathy-136088b2686da8dc9fca4e3b77faad28e1a873d1.tar.zst
gsoc2013-empathy-136088b2686da8dc9fca4e3b77faad28e1a873d1.zip
Fix distcheck when doing parallel build
This makes sure the icones are done (un)installing before regenerating the icon cache.
-rw-r--r--data/icons/Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 4bac794d6..c130a22ce 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -251,9 +251,13 @@ uninstall-icons:
rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
-install-data-local: install-icons update-icon-cache
+install-data-local:
+ $(MAKE) install-icons
+ $(MAKE) update-icon-cache
-uninstall-local: uninstall-icons update-icon-cache
+uninstall-local:
+ $(MAKE) uninstall-icons
+ $(MAKE) update-icon-cache
# Local copy of the "installed" icon. This is used to be able to run empathy
# from source (see bgo #616159)