diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2012-08-08 22:35:56 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-08-08 22:35:56 +0200 |
| commit | bf8c9d9250ca56a53ba9412f2910776a4881af17 (patch) | |
| tree | 1c1f394f9cb1a5c09c4327bf8dbba0b9ff77a51f | |
| parent | 4065ae727259bf6f8aef55e74c40f93f47cef3ad (diff) | |
Regenerate icon cache after icons (un)install
Move generation of the icon cache to an (un)install hook, which
should ensure that it's done after all needed files are in place.
This should fix make distcheck which otherwise errors out with:
ERROR: files left after uninstall:
./share/icons/hicolor/icon-theme.cache
| -rw-r--r-- | data/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index fd2497e..f4e53fb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -38,6 +38,8 @@ install-icons: mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps; \ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/sound-juicer.$$EXTENSION; \ done + +update-icon-cache: @-if test -z "$(DESTDIR)"; then \ echo "Updating GTK icon cache."; \ $(gtk_update_icon_cache); \ @@ -59,6 +61,7 @@ uninstall-icons: done install-data-local: install-icons +install-data-hook: update-icon-cache if GCONF_SCHEMAS_INSTALL @if test -z "$(DESTDIR)" ; then \ for p in $(schema_DATA) ; do \ @@ -72,6 +75,7 @@ if GCONF_SCHEMAS_INSTALL endif uninstall-local: uninstall-icons +uninstall-hook: update-icon-cache CLEANFILES = \ $(desktop_DATA) \ |