diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-10 12:39:27 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-12-10 13:08:35 -0800 |
| commit | c9f927d5474cc839eb61bbc2c36469d7eb1a6d19 (patch) | |
| tree | 456919259779501ee583b0f4bfd112071270d033 /subsurface-install.pri | |
| parent | 4ee59bc1b707b89ff96caa1d96fc95e7acfd8b88 (diff) | |
| download | subsurface-c9f927d5474cc839eb61bbc2c36469d7eb1a6d19.tar.gz | |
Updates to Ubuntu package building process
Marble can't be static, so instead we build a shared library but give it a
different name so it can be installed in parallel with the "real"
libmarblewidget.so.
Also make sure that the correct libusb is installed so that Atomics Aquatics
dive computers are supported.
Fixes #782
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-install.pri')
| -rw-r--r-- | subsurface-install.pri | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index d3985ace1..8125d346f 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -165,6 +165,11 @@ mac { target.path = /$(EXPORT_BINDIR) target.files = $$TARGET + !isEmpty(SPECIAL_MARBLE_PREFIX) { + ourmarble.path = /$(prefix)/lib + ourmarble.files = marble-build/src/lib/marble/libssrfmarblewidget.so* + } + desktop.path = /$(EXPORT_DESKTOPDIR) desktop.files = $$DESKTOP_FILE manpage.path = /$(EXPORT_MANDIR) @@ -183,6 +188,7 @@ mac { translation.CONFIG += no_check_exist INSTALLS += target desktop manpage doc marbledir translation icon theme + !isEmpty(SPECIAL_MARBLE_PREFIX) : INSTALLS += ourmarble install.target = install } !isEmpty(TRANSLATIONS) { |