Since we don't want configure, use gnumake to find libdivecomputer

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

diff --git a/Makefile b/Makefile
index f962c0f01a0ae8fe730f68286a274a2d20171381..47835d306ce7d93c446b7f753035bee28bfa8c6e 100644 (file)
--- 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