X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Makefile;h=4be5991f400b6980279afe6b2fea3dad8112907e;hb=7783387b978e5c13a415d0076ab9ff8e1c45bf4c;hp=e05b44e94ff36019c4dbc7bd0bf67dbb36218a82;hpb=7df7518625b5a80aa1ff35c8c6e49e6e257672d9;p=ext%2Fsubsurface.git

diff --git a/Makefile b/Makefile
index e05b44e..4be5991 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.0
+VERSION=1.1
 
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
@@ -6,34 +6,47 @@ INSTALL=install
 
 # these locations seem to work for SuSE and Fedora
 # prefix = $(HOME)
-prefix = /usr
-DESTDIR = $(prefix)/bin
-DESKTOPDIR = $(prefix)/share/applications
-ICONPATH = $(prefix)/share/icons/hicolor
+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
 # give up. You can override by simply setting it here
 #
-libdc-local := $(wildcard /usr/local/include/libdivecomputer/*)
-libdc-usr := $(wildcard /usr/include/libdivecomputer/*)
+libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
+libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
+libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
+libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
 
 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-local64)),)
+	LIBDIVECOMPUTERDIR = /usr/local
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
 else ifneq ($(strip $(libdc-usr)),)
 	LIBDIVECOMPUTERDIR = /usr
 	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
-	LIBDIVECOMPUTERARCHIVE = -ldivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+else ifneq ($(strip $(libdc-usr64)),)
+	LIBDIVECOMPUTERDIR = /usr
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/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.
@@ -44,6 +57,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
@@ -56,13 +70,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 755 $(MANDIR)
+	$(INSTALL) -m 644 $(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
@@ -94,12 +110,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
+gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h Makefile
 	$(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