diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-18 10:34:06 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-18 10:37:48 -0800 |
| commit | ea2eb6afe375fec61926693b179754f8d05f782f (patch) | |
| tree | aa7fa2bfa58e89082544c3a2eccfcc47b719041e | |
| parent | caa153af79d7650181e4fdbbef281ac1bbca4bfd (diff) | |
| download | subsurface-ea2eb6afe375fec61926693b179754f8d05f782f.tar.gz | |
Update the ubuntu / debian build rules
Dang. I didn't pay attention that commit 2677f3ca79f3 ("LIBMARBLEDEVEL
points to an install dir, not a build dir") broke the way I build the
Linux binaries.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/ubuntu/debian/12.04.rules | 1 | ||||
| -rwxr-xr-x | packaging/ubuntu/debian/rules | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/packaging/ubuntu/debian/12.04.rules b/packaging/ubuntu/debian/12.04.rules index 3565a1838..78a815595 100755 --- a/packaging/ubuntu/debian/12.04.rules +++ b/packaging/ubuntu/debian/12.04.rules @@ -29,6 +29,7 @@ override_dh_auto_configure: -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \ -DBUILD_WITH_DBUS=OFF ../marble-source ; \ make -j8 ; \ + ln -s src/lib/marble lib ; \ mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \ ln -s . marble ) patch -p1 < packaging/ubuntu/0001-Make-build-with-Qt4.patch diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules index db893cd23..ef197521c 100755 --- a/packaging/ubuntu/debian/rules +++ b/packaging/ubuntu/debian/rules @@ -29,6 +29,7 @@ override_dh_auto_configure: -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \ -DBUILD_WITH_DBUS=OFF ../marble-source ; \ make -j8 ; \ + ln -s src/lib/marble lib ; \ mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \ ln -s . marble ) qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 LIBMARBLEDEVEL=./marble-build SPECIAL_MARBLE_PREFIX=1 subsurface.pro |