summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INSTALL3
-rwxr-xr-xscripts/build.sh2
-rwxr-xr-xscripts/run.sh2
3 files changed, 3 insertions, 4 deletions
diff --git a/INSTALL b/INSTALL
index bbda32e12..c0bb7882a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -123,7 +123,8 @@ git clone -b v4.4.1 git://subsurface-divelog.org/subsurface
Now you can run Subsurface like this:
-./subsurface/scripts/run.sh
+cd ~/src/subsurface
+./subsurface
2. the harder way
~~~~~~~~~~~~~~~~~
diff --git a/scripts/build.sh b/scripts/build.sh
index 14f235a29..9ea0f4f76 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -97,6 +97,6 @@ make -j4
make install
cd $SRC/subsurface
-$QMAKE LIBDCDEVEL=1 LIBMARBLEDEVEL=$SRC/install SPECIAL_MARBLE_PREFIX=1 LIBGIT2DEVEL=$SRC/libgit2 subsurface.pro
+$QMAKE CONFIG+=setRpath LIBDCDEVEL=1 LIBMARBLEDEVEL=$SRC/install SPECIAL_MARBLE_PREFIX=1 LIBGIT2DEVEL=$SRC/libgit2 subsurface.pro
make -j4
diff --git a/scripts/run.sh b/scripts/run.sh
deleted file mode 100755
index 6e0e0d1e9..000000000
--- a/scripts/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=install/lib:$LD_LIBRARY_PATH ./subsurface/subsurface