Don't run gtk-update-icon-cache if DESTDIR is set

[ext/subsurface.git] / Makefile

diff --git a/Makefile b/Makefile
index 5b5adb044357477fd8fd0017c9e5fe7ac2b62a2b..3f563a3b51e55af0aa264e29fc21890da39ba4a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,7 @@ ifeq ($(CC), i686-w64-mingw32-gcc)
        LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer`
        LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer`
        RESFILE = packaging/windows/subsurface.res
+       LDFLAGS += -Wl,-subsystem,windows
 else
 
 libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
@@ -89,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)