[PATCH 3/3] Add a variable for the Marble library name

[Thiago Macieira]

I need that for a Marble installed somewhere other than the linker's
default search path.

Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 Configure.mk | 2 ++
 Makefile     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Configure.mk b/Configure.mk
index 745b03c..c7b6ba5 100644
--- a/Configure.mk
+++ b/Configure.mk
@@ -149,6 +149,7 @@ SQLITE3FLAGS = $(strip $(shell $(PKGCONFIG) --cflags sqlite3))
 # Before Marble 4.9, the GeoDataTreeModel.h header wasn't installed
 # Check if it's present by trying to compile
 MARBLEFLAGS = $(shell $(CXX) $(QTCXXFLAGS) -E -include marble/GeoDataTreeModel.h -xc++ /dev/null > /dev/null 2>&1 || echo " -DINCOMPLETE_MARBLE")
+MARBLELIBS = -lmarblewidget
 
 # Write the configure file
 all: configure
@@ -186,6 +187,7 @@ configure $(CONFIGURE): Configure.mk
 	LIBSQLITE3 = $(LIBSQLITE3)\\\
 	SQLITE3FLAGS = $(SQLITE3FLAGS)\\\
 	MARBLEFLAGS = $(MARBLEFLAGS)\\\
+	MARBLELIBS = $(MARBLELIBS)\\\
 	" | tr '\\' '\n' > $(CONFIGFILE)
 
 else
diff --git a/Makefile b/Makefile
index afcb274..4952231 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ else
 endif
 
 LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \
-	$(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) -lmarblewidget
+	$(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) $(MARBLELIBS)
 
 MSGLANGS=$(notdir $(wildcard po/*.po))
 
-- 
1.7.11.7