diff options
| author |  Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> | 2013-10-05 14:57:34 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-05 19:52:07 -0700 |
| commit | 751c33bb8ec01969f10156656acb39a9c7e1a600 (patch) | |
| tree | 86f972c938f63048d5244dce5776a5fcd15c7526 /Configure.mk | |
| parent | b27bdd5882cb7a78a82ec0a0d781399dcd937ca3 (diff) | |
| download | subsurface-751c33bb8ec01969f10156656acb39a9c7e1a600.tar.gz | |
LIBDCDEVEL=y build seems broken
This unbreaks a LIBDCDEVEL=y build for me.
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Configure.mk')
| -rw-r--r-- | Configure.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Configure.mk b/Configure.mk index 4039db454..ba5ff018c 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 |