mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

HTML export: fix packaging of theme dir

Browse source 
I was confused by the function name getSubsurfaceDataPath() - it does not
find paths relative to the "data" folder, if finds the path where we might
install folders like "data", "translations", or "theme".
"data" is for some reason where we install the "marbledata" files.
Therefore on both Mac and Windows we need to put the "theme" directory
next to the "data" directory, not below it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-08 07:54:11 -07:00
parent 439c2e0473
commit bded22f2f6
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packaging/windows/subsurface.nsi.in
View file

@ -102,6 +102,7 @@ Section
# the DLLs there that we depend on, this is much easier # the DLLs there that we depend on, this is much easier
File subsurface.exe File subsurface.exe
File /r data File /r data
File /r theme
File /r images File /r images
File /r plugins File /r plugins
File /r Documentation File /r Documentation

4
subsurface-install.pri
View file

@ -31,7 +31,7 @@ mac {
datadir = Contents/Resources/share datadir = Contents/Resources/share
marbledir.path = Contents/Resources/data marbledir.path = Contents/Resources/data
theme.path = Contents/Resources/data theme.path = Contents/Resources
doc.path = $$datadir/Documentation doc.path = $$datadir/Documentation
translation.path = Contents/Resources/translations translation.path = Contents/Resources/translations
qttranslation.path = Contents/Resources/translations qttranslation.path = Contents/Resources/translations
@ -62,7 +62,7 @@ mac {
deploy.CONFIG += no_check_exist deploy.CONFIG += no_check_exist
target.path = $$WINDOWSSTAGING target.path = $$WINDOWSSTAGING
marbledir.path = $$WINDOWSSTAGING/data marbledir.path = $$WINDOWSSTAGING/data
theme.path = $$WINDOWSSTAGING/data theme.path = $$WINDOWSSTAGING
INSTALLS += deploy marbledir target doc theme INSTALLS += deploy marbledir target doc theme
translation.path = $$WINDOWSSTAGING/translations translation.path = $$WINDOWSSTAGING/translations