X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Makefile;h=0c67f40f7838e6f0060606d5a501d80b59584254;hb=089ab5e97c50de9e0f566bda9e881e0e3c7cb0bf;hp=f962c0f01a0ae8fe730f68286a274a2d20171381;hpb=1bf28b68c9dc9b929b1372b79920311a9c10e4cc;p=ext%2Fsubsurface.git

diff --git a/Makefile b/Makefile
index f962c0f..0c67f40 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,24 @@ prefix = $(HOME)
 DESTDIR = $(prefix)/bin
 NAME = subsurface
 
-LIBDIVECOMPUTERDIR = /usr/local
-LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
-LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+# 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/*)
+
+ifneq ($(strip $(libdc-local)),)
+	LIBDIVECOMPUTERDIR = /usr/local
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = -L$(LIBDIVECOMPUTERDIR)/lib -ldivecomputer
+else ifneq ($(strip $(libdc-usr)),)
+	LIBDIVECOMPUTERDIR = /usr
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = -ldivecomputer
+else
+	$(error Cannot find libdivecomputer - please edit Makefile)
+endif
 
 # Libusb-1.0 is only required if libdivecomputer was built with it.
 # And libdivecomputer is only built with it if libusb-1.0 is
@@ -32,8 +47,8 @@ $(NAME): $(OBJS)
 	$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
 
 install: $(NAME)
-	$(INSTALL) -d -m 755 '$(DESTDIR)'
-	$(INSTALL) $(NAME) '$(DESTDIR)'
+	$(INSTALL) -d -m 755 $(DESTDIR)
+	$(INSTALL) $(NAME) $(DESTDIR)
 
 parse-xml.o: parse-xml.c dive.h
 	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c