diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-17 23:06:43 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-17 23:07:53 -0800 |
| commit | 86274b603e6e18e8bfa5921a062ad6365d18af97 (patch) | |
| tree | f76d564ba5d839cfbf9009702a4533016103bd87 | |
| parent | 26f03be236ca7db89d27369173ca182c17bef7fc (diff) | |
| download | subsurface-86274b603e6e18e8bfa5921a062ad6365d18af97.tar.gz | |
build.sh: use setRpath and remove run.sh
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | INSTALL | 3 | ||||
| -rwxr-xr-x | scripts/build.sh | 2 | ||||
| -rwxr-xr-x | scripts/run.sh | 2 |
3 files changed, 3 insertions, 4 deletions
@@ -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 |