From 25d2f187e0301d858ab55772fa89edc29fb693d2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 18 Feb 2015 00:17:02 -0800 Subject: [PATCH] INSTALL: remove the detailed install instructions It's much easier to just keep the build.sh script working and ask people to use that instead of all the confusion with the detailed instructions. Signed-off-by: Dirk Hohndel --- INSTALL | 73 ++------------------------------------------------------- 1 file changed, 2 insertions(+), 71 deletions(-) diff --git a/INSTALL b/INSTALL index b30a29467..3cc8f73a8 100644 --- a/INSTALL +++ b/INSTALL @@ -102,13 +102,8 @@ lib64usb1.0-devel lib64zip-devel lib64qt5webkitwidgets-devel qttools5 \ qttranslations5 lib64qt5xml-devel lib64qt5test-devel lib64qtscript-devel \ lib64qt5svg-devel lib64qt5concurrent-devel" -In order to build Subsurface, you have two options: - -1. the easy way -~~~~~~~~~~~~~~~ - -Use the supplied build script. This should work on most systems that have -all the prerequisite packages installed... +In order to build Subsurface, use the supplied build script. This should +work on most systems that have all the prerequisite packages installed... You should have Subsurface sources checked out in a sane place, something like this: @@ -125,70 +120,6 @@ Now you can run Subsurface like this: cd ~/src/subsurface ./subsurface -2. the harder way -~~~~~~~~~~~~~~~~~ - -First you need to compile our version of libdivecomputer: - -$ mkdir ~/src # unless you have this already -$ cd ~/src -$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/libdc libdivecomputer - # or -b Subsurface-testing to get the testing version - careful, - # careful - this gets rebased and may be broken - # -> when not building a release version of Subsurface but the - # latest master, it may be necessary to build against the - # Subsurface-testing branch - -$ cd libdivecomputer -$ autoreconf --install -$ ./configure --disable-shared -$ make -$ sudo make install - -Then you compile our custom branch of libmarblewidget - -$ cd ~/src -$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/marble marble-source - # or -b Subsurface-testing to get the testing version - careful, - # careful - this gets rebased and may be broken - -$ mkdir marble-build -$ cd marble-build -$ cmake -DQTONLY=ON -DQT5BUILD=ON \ - -DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \ - -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \ - -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \ - -DBUILD_WITH_DBUS=OFF ../marble-source -$ make # <- this step will take quite a while... if you have more cores - # try make -j8 or something like that -$ sudo make install - -Finally you can compile Subsurface: - -$ cd ~/src -$ git clone git://subsurface-divelog.org/subsurface.git -$ cd subsurface -$ git checkout v4.4 # this get's you the last release - # skip this step to build the latest development - # version -$ qmake SPECIAL_MARBLE_PREFIX=1 -# on Fedora/OpenSUSE you need qmake-qt5 -$ make -$ sudo make install # [optionally, add: prefix=/usr/local] - -At least on Fedora and OpenSUSE you need to make sure that /usr/local/lib -is searched for shared libraries (this is where the steps above installed -libdivecomputer and libmarblewidget in order not to conflict with system -pacakges). So you need to do the following: - -$ sudo echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf -$ sudo ldconfig - -Now you should be able to start the Subsurface binary you just created -with - -$ ./subsurface - Building Subsurface under MacOSX (using Homebrew) -------------------------------------------------