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

[Building] Don't require ending slash in USE_LIBPATH and QUPZILLA_PREFIX options

Browse Source
This commit is contained in:
nowrep 2014-03-03 15:06:22 +01:00
parent a7d382ee42
commit 29f20ae520
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BUILDING
View File

@ -58,7 +58,7 @@ MAC OS X
After successful compilation, you need to run macdeploy.sh script to correctly
build the application bundle. You will do it with following command:
$ ./scripts/macdeploy.sh <path-to-macdeployqt>
$ ./mac/macdeploy.sh <path-to-macdeployqt>
You need to specifiy path to macdeployqt (usually in QTDIR/bin/macdeployqt) only
if it is not in PATH.
@ -152,7 +152,7 @@ Available Defines
Linux / Unix specific defines:
NO_X11 Disable all direct X11 calls.
Enable when building for Wayland.
Enable this when building for Wayland.
example:
$ export NO_X11="true"
@ -173,10 +173,10 @@ Available Defines
USE_LIBPATH By default, /usr/lib/ is used for libQupZilla and /usr/lib/qupzilla
for plugins.
You can change it by setting this define. Ending slash is needed!
You can change it by setting this define.
example:
$ export USE_LIBPATH="/usr/lib64/"
$ export USE_LIBPATH="/usr/lib64"
NO_SYSTEM_DATAPATH By default, QupZilla is using /usr/share/qupzilla/ path
for storing themes and translations.
@ -186,15 +186,14 @@ Available Defines
example:
$ export NO_SYSTEM_DATAPATH="true"
QUPZILLA_PREFIX You can define different prefix. Prefix must contain ending slash.
(default prefix is "/usr/")
QUPZILLA_PREFIX You can define different prefix.
QupZilla binary will then be moved to PREFIX/bin/, use
PREFIX/share/qupzilla/ as datadir, PREFIX/share/applications for
desktop launcher and PREFIX/share/pixmaps for icon.
Ending slash is needed!
(default prefix is "/usr/")
example:
$ export QUPZILLA_PREFIX="/usr/"
$ export QUPZILLA_PREFIX="/usr"
DISABLE_DBUS Build without QtDBus module. Native desktop notifications
will be disabled.

16
src/defines.pri
View File

@ -109,18 +109,18 @@ equals(d_disable_updates_check, "true") { DEFINES *= DISABLE_UPDATES_CHECK }
hicolor_folder = /usr/share/icons/hicolor
!equals(d_prefix, "") {
binary_folder = "$$d_prefix"bin
library_folder = "$$d_prefix"lib
data_folder = "$$d_prefix"share/qupzilla
launcher_folder = "$$d_prefix"share/applications
icon_folder = "$$d_prefix"share/pixmaps
hicolor_folder = "$$d_prefix"share/icons/hicolor
binary_folder = "$$d_prefix"/bin
library_folder = "$$d_prefix"/lib
data_folder = "$$d_prefix"/share/qupzilla
launcher_folder = "$$d_prefix"/share/applications
icon_folder = "$$d_prefix"/share/pixmaps
hicolor_folder = "$$d_prefix"/share/icons/hicolor
}
!equals(d_use_lib_path, ""):library_folder = $$d_use_lib_path
DEFINES *= USE_LIBPATH=\\\"""$$library_folder/"\\\""
DEFINES *= USE_DATADIR=\\\"""$$data_folder/"\\\""
DEFINES *= USE_LIBPATH=\\\"""$$library_folder"\\\""
DEFINES *= USE_DATADIR=\\\"""$$data_folder"\\\""
# Git revision
rev = $$system(cd ../ && sh $$PWD/../scripts/getrevision.sh)

2
src/lib/app/mainapplication.cpp
View File

@ -123,7 +123,7 @@ MainApplication::MainApplication(int &argc, char** argv)
setOrganizationDomain("qupzilla");
#if defined(Q_OS_UNIX) && !defined(NO_SYSTEM_DATAPATH)
DATADIR = USE_DATADIR;
DATADIR = USE_DATADIR "/";
#else
DATADIR = qApp->applicationDirPath() + "/";
#endif