From: Dirk Hohndel Date: Tue, 11 Oct 2011 00:53:59 +0000 (-0700) Subject: Since we don't want configure, use gnumake to find libdivecomputer X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=bd8948386d555560477238dc09921b83f07b48b2;hp=0f9d1757a4590f554bcfc87f79c7a72baa5ad95d;p=ext%2Fsubsurface.git Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel --- 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