Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

Merge pull request #1848 from berniyh/master

Browse Source 
Allow to split shared data from prefix
This commit is contained in:
David Rosca 2016-02-14 10:18:55 +01:00
commit 3d1996696b
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILDING
View File

@ -197,6 +197,12 @@ Available Defines
example: example:
$ export QUPZILLA_PREFIX="/usr" $ export QUPZILLA_PREFIX="/usr"
SHARE_FOLDER You can define the path of the share folder, i.e. /usr/share
QupZilla will then use SHARE_FOLDER/qupzilla as datadir,
SHARE_FOLDER/applications for desktop launcher and
SHARE_FOLDER/pixmaps for the icon. By default it is not defined and
files will be installed as described above.
DISABLE_DBUS Build without QtDBus module. Native desktop notifications DISABLE_DBUS Build without QtDBus module. Native desktop notifications
will be disabled. will be disabled.

21
src/defines.pri
View File

@ -23,6 +23,7 @@ d_disable_dbus = $$(DISABLE_DBUS)
d_disable_updates_check = $$(DISABLE_UPDATES_CHECK) d_disable_updates_check = $$(DISABLE_UPDATES_CHECK)
d_debug_build = $$(DEBUG_BUILD) d_debug_build = $$(DEBUG_BUILD)
d_prefix = $$(QUPZILLA_PREFIX) d_prefix = $$(QUPZILLA_PREFIX)
d_share = $$(SHARE_FOLDER)
equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH } equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
equals(d_kde_integration, "true") { DEFINES *= KDE_INTEGRATION } equals(d_kde_integration, "true") { DEFINES *= KDE_INTEGRATION }
@ -59,20 +60,24 @@ haiku-* {
library_folder = /usr/lib library_folder = /usr/lib
arch_lib_path = /usr/lib/$${QT_ARCH}-linux-gnu arch_lib_path = /usr/lib/$${QT_ARCH}-linux-gnu
exists($$arch_lib_path): library_folder = $$arch_lib_path exists($$arch_lib_path): library_folder = $$arch_lib_path
data_folder = /usr/share/qupzilla # Define a reasonable default for share_folder
launcher_folder = /usr/share/applications share_folder = /usr/share
icon_folder = /usr/share/pixmaps
hicolor_folder = /usr/share/icons/hicolor
!equals(d_prefix, "") { !equals(d_prefix, "") {
binary_folder = "$$d_prefix"/bin binary_folder = "$$d_prefix"/bin
library_folder = "$$d_prefix"/lib library_folder = "$$d_prefix"/lib
data_folder = "$$d_prefix"/share/qupzilla share_folder = "$$d_prefix"/share
launcher_folder = "$$d_prefix"/share/applications
icon_folder = "$$d_prefix"/share/pixmaps
hicolor_folder = "$$d_prefix"/share/icons/hicolor
} }
!equals(d_share, "") {
share_folder = "$$d_share"
}
data_folder = $$share_folder/qupzilla
launcher_folder = $$share_folder/applications
icon_folder = $$share_folder/pixmaps
hicolor_folder = $$share_folder/icons/hicolor
!equals(d_use_lib_path, ""):library_folder = $$d_use_lib_path !equals(d_use_lib_path, ""):library_folder = $$d_use_lib_path
DEFINES *= USE_LIBPATH=\\\"""$$library_folder"\\\"" DEFINES *= USE_LIBPATH=\\\"""$$library_folder"\\\""

4
src/install.pri
View File

@ -44,10 +44,10 @@ mac {
ico256.path = $$hicolor_folder/256x256/apps ico256.path = $$hicolor_folder/256x256/apps
bashcompletion.files = $$PWD/../linux/completion/qupzilla bashcompletion.files = $$PWD/../linux/completion/qupzilla
bashcompletion.path = /usr/share/bash-completion/completions bashcompletion.path = $$share_folder/usr/share/bash-completion/completions
appdata.files = $$PWD/../linux/appdata/qupzilla.appdata.xml appdata.files = $$PWD/../linux/appdata/qupzilla.appdata.xml
appdata.path = /usr/share/appdata appdata.path = $$share_folder/appdata
INSTALLS += target target1 target2 target3 INSTALLS += target target1 target2 target3