From bd8948386d555560477238dc09921b83f07b48b2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 10 Oct 2011 17:53:59 -0700 Subject: [PATCH] Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel --- Makefile | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f962c0f..47835d3 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 -- 2.45.2