From: John Darrington Date: Thu, 1 Mar 2012 20:21:44 +0000 (+0100) Subject: Don't update the icon cache if DESTDIR is non-empty. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=909400c0bb16e67779bef29b1a2a2ec885a3dd12;p=pspp Don't update the icon cache if DESTDIR is non-empty. Packagers generally use "make install DESTDIR=xxx" to generate their install files, which are then copied in place to the target filesystem. In such a scenario, it's inappropriate to copy the icon.cache files. This change therefore does not update the icon cache if a DESTDIR has been specified. Instead it's left to the packager to make his own arrangements for updating the icon cache on the target filesystem. --- diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 8de1f91036..cd2696fba5 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -96,7 +96,9 @@ install-icons: $(MKDIR_P) $(themedir)/$$size/apps ; \ $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \ done - gtk-update-icon-cache --ignore-theme-index $(themedir) + if test -z "$(DESTDIR)" ; then \ + gtk-update-icon-cache --ignore-theme-index $(themedir); \ + fi INSTALL_DATA_HOOKS += install-icons install-lang