]> git.tdb.fi Git - ext/subsurface.git/blobdiff - Makefile
Keep window size for new notebook pages
[ext/subsurface.git] / Makefile
index 3e0d8b199cd378f86bd651cc8cd6ca2072b2c498..e946469bbaa00fd9ebfab5d28a94ae2d66ad1892 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,7 @@ LIBUSB = $(shell pkg-config --libs libusb-1.0 2> /dev/null)
 
 LIBXML2 = $(shell xml2-config --libs)
 LIBGTK = $(shell pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0)
+LIBDIVECOMPUTERCFLAGS = -I$(LIBDIVECOMPUTERINCLUDES)
 LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
 
 LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread
@@ -66,7 +67,8 @@ install: $(NAME)
        $(INSTALL) -d -m 755 $(ICONDIR)
        $(INSTALL) $(ICONFILE) $(ICONDIR)
        $(gtk_update_icon_cache)
-       $(INSTALL) -m 644 $(MANFILES) $(MANDIR)
+       $(INSTALL) -d -m 644 $(MANDIR)
+       $(INSTALL) $(MANFILES) $(MANDIR)
 
 parse-xml.o: parse-xml.c dive.h
        $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c
@@ -98,12 +100,12 @@ print.o: print.c dive.h display.h display-gtk.h
 
 libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecomputer.h
        $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` \
-                       -I$(LIBDIVECOMPUTERINCLUDES) \
+                       $(LIBDIVECOMPUTERCFLAGS) \
                        -c libdivecomputer.c
 
 gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h
        $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
-                       -I$(LIBDIVECOMPUTERINCLUDES) \
+                       $(LIBDIVECOMPUTERCFLAGS) \
                        -DVERSION_STRING='"v$(VERSION)"' \
                        -c gtk-gui.c