mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

AppImage: Fix path of machine-id in dbus library

Browse source 
When building dbus within the appimage, cmake picks up the installation
path of various files dbus uses through the GNUInstallDirs package,
however this doesn't work under the appimage build.
So we replace the variable with the normal location of this file.

Signed-off-by: Paul Buxton <paubuxton.mail@googlemail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Paul Buxton 2019-09-22 15:01:52 +01:00 committed by Dirk Hohndel
parent 4b391c448d
commit c1aa686f9c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/docker/trusty-qt512/Dockerfile
View file

@ -55,7 +55,8 @@ RUN rm -rf qtwebkit
ADD dbus-1.12.16.tar.gz .
RUN mkdir dbus-1.12.16/build && \
cd dbus-1.12.16/build && \
cmake ../cmake -DDBUS_INSTALL_SYSTEM_LIBS=1 && \
sed -inline 's/${CMAKE_INSTALL_FULL_LOCALSTATEDIR}\/lib\/dbus\/machine-id/\/var\/lib\/dbus\/machine-id/' ../cmake/CMakeLists.txt && \
cmake ../cmake -DDBUS_INSTALL_SYSTEM_LIBS=1 && \
make install && \
ldconfig