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

[ext/subsurface.git] / Makefile

diff --git a/Makefile b/Makefile
index cc353f7d2edc5b1ae076a7f029c49bfff06d5d4f..3f563a3b51e55af0aa264e29fc21890da39ba4a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,8 @@ ifeq ($(CC), i686-w64-mingw32-gcc)
        LIBDIVECOMPUTERDIR = /usr/i686-w64-mingw32/sys-root/mingw/include/libdivecomputer
        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)
@@ -76,7 +78,7 @@ LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread
 
 OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \
        parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \
-       gtk-gui.o
+       gtk-gui.o $(RESFILE)
 
 $(NAME): $(OBJS)
        $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
@@ -88,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)