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>
This commit is contained in:
Dirk Hohndel 2013-10-09 12:56:15 -07:00
parent 9f582f76d0
commit 3554e1de19

16
INSTALL
View file

@ -52,25 +52,25 @@ $ brew link --force sqlite
$ mkdir -p ~/src/marble/build $ mkdir -p ~/src/marble/build
$ git clone -b KDE/4.11 git://anongit.kde.org/marble ~/src/marble/sources $ git clone -b KDE/4.11 git://anongit.kde.org/marble ~/src/marble/sources
$ cd ~/src/marble/build $ cd ~/src/marble/build
$ cmake -DCMAKE_BUILD_TYPE=Debug -DQTONLY=TRUE -DCMAKE_INSTALL_PREFIX=/usr/local ~/src/marble/sources $ cmake -DCMAKE_BUILD_TYPE=Debug -DQTONLY=TRUE -DCMAKE_INSTALL_PREFIX=/usr/local ..
$ make
$ sudo make install
$ cd src/lib $ cd src/lib
$ mkdir -p /usr/local/include/marble $ make -j4
$ cp $(find . -name '*.h') /usr/local/include/marble/
$ cp *dylib /usr/local/lib/ $ cp *dylib /usr/local/lib/
$ mkdir -p /usr/local/include/marble
$ cd ../../../source/src/lib
$ cp $(find . -name '*.h') /usr/local/include/marble/
5) Install Libdivecomputer 5) Install Libdivecomputer
$ brew install automake libtool $ brew install automake libtool
$ cd ~/src $ cd ~/src
$ git clone git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer $ git clone git://git.libdivecomputer.org/libdivecomputer
$ cd libdivecomputer $ cd libdivecomputer
$ git checkout release-0.4 $ git checkout release-0.4
$ autoreconf --install $ autoreconf --install
$ ./configure $ ./configure
$ make $ make
$ sudo make install $ make install
6) Compile Subsurface 6) Compile Subsurface
@ -79,7 +79,7 @@ $ git clone git://subsurface.hohndel.org/subsurface.git
$ cd subsurface $ cd subsurface
$ qmake $ qmake
$ make $ make
$ sudo make install $ sudo make install_mac_bundle
After the above is done, Subsurface will be installed to After the above is done, Subsurface will be installed to
/Applications. /Applications.