diff options
| author |  Roland Dreier <roland@digitalvampire.org> | 2011-10-31 13:05:55 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 17:06:41 -0700 |
| commit | 4d561234022adbc72e30c3152730b6202f3f0f8f (patch) | |
| tree | 618652bbf9f43e435bd80f1852982e294c0e4a57 | |
| parent | 84e6f200f64721771be18564830e277f0885e117 (diff) | |
| download | subsurface-4d561234022adbc72e30c3152730b6202f3f0f8f.tar.gz | |
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 <roland@digitalvampire.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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) |