summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-12-15 12:11:14 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-12-15 12:11:14 -0800
commite63b64225299fb9296e14c9c9256bf96183ad221 (patch)
tree2e609aa6f96cdc1ffc81107723dd978cbb0b1c08
parent6da5775c05c86db6b7bfee5b9369e4853cdd45c3 (diff)
downloadsubsurface-e63b64225299fb9296e14c9c9256bf96183ad221.tar.gz
Document the use of SPECIAL_MARBLE_PREFIX=1
Since we suggest building with our marble branch we need to tell people to use SPECIAL_MARBLE_PREFIX=1 or the build process won't find the correct library. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--INSTALL4
1 files changed, 3 insertions, 1 deletions
diff --git a/INSTALL b/INSTALL
index 006ceb462..0e2f763ee 100644
--- a/INSTALL
+++ b/INSTALL
@@ -42,6 +42,8 @@ The following options are recognized when passed to qmake:
V=1 Disable the "silent" build mode
LIBDCDEVEL=1 Search for libdivecomputer in ../libdivecomputer
LIBMARBLEDEVEL=path Search for marble library and includes in path
+ SPECIAL_MARBLE_PREFIX=1 Use libssrfmarblewidget as library name
+ This is needed when building with our marble branch
LIBGIT2DEVEL=path Search for libgit2 library and includes in path
INCLUDEPATH+=xxx Add xxx to the include paths to the compiler
(pass the actual path, without -I)
@@ -125,7 +127,7 @@ $ cd subsurface
$ cd git checkout v4.3 # this get's you the last release
# skip this step to build the latest development
# version
-$ qmake # on Fedora you need qmake-qt5
+$ qmake SPECIAL_MARBLE_PREFIX=1 # on Fedora you need qmake-qt5
$ make
$ sudo make install # [optionally, add: prefix=/usr/local]