From 4d561234022adbc72e30c3152730b6202f3f0f8f Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Mon, 31 Oct 2011 13:05:55 -0700 Subject: [PATCH] Don't run gtk-update-icon-cache if DESTDIR is set We don't want to run gtk-update-icon-cache during a package build, when we're installing into a staging directory just to create a tree that will be packaged up and really installed later. The standard heuristic seems to be to skip gtk-update-icon-cache if DESTDIR is set (ie we're installing to a different location than we're configured to run from). Signed-off-by: Roland Dreier Signed-off-by: Linus Torvalds --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0d736e1..3f563a3 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,9 @@ install: $(NAME) $(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR) $(INSTALL) -d -m 755 $(ICONDIR) $(INSTALL) $(ICONFILE) $(ICONDIR) - $(gtk_update_icon_cache) + @-if test -z "$(DESTDIR)"; then \ + $(gtk_update_icon_cache); \ + fi $(INSTALL) -d -m 755 $(MANDIR) $(INSTALL) -m 644 $(MANFILES) $(MANDIR) -- 2.45.2