LIBDCDEVEL=y build seems broken

Cristian Ionescu-Idbohrn cristian.ionescu-idbohrn at axis.com
Sat Oct 5 05:57:34 UTC 2013


This unbreaks a LIBDCDEVEL=y build for me.

Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn at axis.com>
---
 Configure.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Configure.mk b/Configure.mk
index 4039db4..ba5ff01 100644
--- a/Configure.mk
+++ b/Configure.mk
@@ -34,6 +34,10 @@ ifeq ($(CC), i686-w64-mingw32-gcc)
 else ifeq ($(UNAME), darwin)
 	LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
 	LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
+else ifneq ($(LIBDCDEVEL),)
+	LIBDIVECOMPUTERDIR = ../libdivecomputer
+	LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/src/.libs/libdivecomputer.a
 else ifeq ($(shell $(PKGCONFIG) --exists libdivecomputer; echo $$?),0)
 	LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
 	LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
@@ -43,11 +47,7 @@ libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
 libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
 libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)

-ifneq ($(LIBDCDEVEL),)
-	LIBDIVECOMPUTERDIR = ../libdivecomputer
-	LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
-	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/src/.libs/libdivecomputer.a
-else ifneq ($(strip $(libdc-local)),)
+ifneq ($(strip $(libdc-local)),)
 	LIBDIVECOMPUTERDIR = /usr/local
 	LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
 	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
-- 
1.8.4.rc3


Cheers,

-- 
Cristian


More information about the subsurface mailing list