Fix oversight in preference implementation

[ext/subsurface.git] / Makefile

diff --git a/Makefile b/Makefile
index 47835d306ce7d93c446b7f753035bee28bfa8c6e..e946469bbaa00fd9ebfab5d28a94ae2d66ad1892 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,21 @@ CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
 INSTALL=install
 
-prefix = $(HOME)
-DESTDIR = $(prefix)/bin
+# these locations seem to work for SuSE and Fedora
+# prefix = $(HOME)
+prefix = $(DESTDIR)/usr
+BINDIR = $(prefix)/bin
+DATADIR = $(prefix)/share
+DESKTOPDIR = $(DATADIR)/applications
+ICONPATH = $(DATADIR)/icons/hicolor
+ICONDIR = $(ICONPATH)/scalable/apps
+MANDIR = $(DATADIR)/man/man1
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
+
 NAME = subsurface
+ICONFILE = $(NAME).svg
+DESKTOPFILE = $(NAME).desktop
+MANFILES = $(NAME).1
 
 # find libdivecomputer; we don't trust pkg-config here given how young
 # libdivecomputer still is - so we check /usr/local and /usr and then we
@@ -18,13 +30,13 @@ libdc-usr := $(wildcard /usr/include/libdivecomputer/*)
 ifneq ($(strip $(libdc-local)),)
        LIBDIVECOMPUTERDIR = /usr/local
        LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
-       LIBDIVECOMPUTERARCHIVE = -L$(LIBDIVECOMPUTERDIR)/lib -ldivecomputer
+       LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
 else ifneq ($(strip $(libdc-usr)),)
        LIBDIVECOMPUTERDIR = /usr
        LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
-       LIBDIVECOMPUTERARCHIVE = -ldivecomputer
+       LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
 else
-       $(error Cannot find libdivecomputer - please edit Makefile)
+$(error Cannot find libdivecomputer - please edit Makefile)
 endif
 
 # Libusb-1.0 is only required if libdivecomputer was built with it.
@@ -35,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
@@ -47,8 +60,15 @@ $(NAME): $(OBJS)
        $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
 
 install: $(NAME)
-       $(INSTALL) -d -m 755 '$(DESTDIR)'
-       $(INSTALL) $(NAME) '$(DESTDIR)'
+       $(INSTALL) -d -m 755 $(BINDIR)
+       $(INSTALL) $(NAME) $(BINDIR)
+       $(INSTALL) -d -m 755 $(DESKTOPDIR)
+       $(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
+       $(INSTALL) -d -m 755 $(ICONDIR)
+       $(INSTALL) $(ICONFILE) $(ICONDIR)
+       $(gtk_update_icon_cache)
+       $(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
@@ -80,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