summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-09 12:56:15 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-09 13:20:04 -0700
commit3554e1de199848e90a2e3f00db03aa05f52b648b (patch)
treec7d470910066f59a4e80f5afe69e8f9fe2b0223d
parent9f582f76d052423b24f570d9e36036fb81a73818 (diff)
downloadsubsurface-3554e1de199848e90a2e3f00db03aa05f52b648b.tar.gz
Small fixes to the build notes for Mac
Use the correct git tree for libdivecomputer. Only build libmarble, not all of marble Don't try make install for libmarble - it's bogus Copy the correct marble headers Only use sudo to write into /Applications Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--INSTALL14
1 files changed, 7 insertions, 7 deletions
diff --git a/INSTALL b/INSTALL
index fe0f7967d..f589bdde3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -52,25 +52,25 @@ $ brew link --force sqlite
$ mkdir -p ~/src/marble/build
$ git clone -b KDE/4.11 git://anongit.kde.org/marble ~/src/marble/sources
$ cd ~/src/marble/build
-$ cmake -DCMAKE_BUILD_TYPE=Debug -DQTONLY=TRUE -DCMAKE_INSTALL_PREFIX=/usr/local ~/src/marble/sources
-$ make
-$ sudo make install
+$ cmake -DCMAKE_BUILD_TYPE=Debug -DQTONLY=TRUE -DCMAKE_INSTALL_PREFIX=/usr/local ..
$ cd src/lib
+$ make -j4
+$ cp *dylib /usr/local/lib/
$ mkdir -p /usr/local/include/marble
+$ cd ../../../source/src/lib
$ cp $(find . -name '*.h') /usr/local/include/marble/
-$ cp *dylib /usr/local/lib/
5) Install Libdivecomputer
$ brew install automake libtool
$ cd ~/src
-$ git clone git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer
+$ git clone git://git.libdivecomputer.org/libdivecomputer
$ cd libdivecomputer
$ git checkout release-0.4
$ autoreconf --install
$ ./configure
$ make
-$ sudo make install
+$ make install
6) Compile Subsurface
@@ -79,7 +79,7 @@ $ git clone git://subsurface.hohndel.org/subsurface.git
$ cd subsurface
$ qmake
$ make
-$ sudo make install
+$ sudo make install_mac_bundle
After the above is done, Subsurface will be installed to
/Applications.