Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

Fix and simplify library folder for unix

Browse Source 
Using QMAKE_HOST.arch is not the best of all possibilities to do so:
<pre>
cd src/plugins/ && ( test -e Makefile || /usr/lib/i386-linux-gnu/qt5/bin/qmake /tmp/buildd/qupzilla-1.6.6.siduction.8/src/plugins/plugins.pro -nocache QMAKE_CFLAGS_RELEASE=-g\ -O2\ -fstack-protector\ --param=ssp-buffer-size=4\ -Wformat\ -Werror=format-security\ -D_FORTIFY_SOURCE=2 QMAKE_CFLAGS_DEBUG=-g\ -O2\ -fstack-protector\ --param=ssp-buffer-size=4\ -Wformat\ -Werror=format-security\ -D_FORTIFY_SOURCE=2 QMAKE_CXXFLAGS_RELEASE=-g\ -O2\ -fstack-protector\ --param=ssp-buffer-size=4\ -Wformat\ -Werror=format-security\ -D_FORTIFY_SOURCE=2 QMAKE_CXXFLAGS_DEBUG=-g\ -O2\ -fstack-protector\ --param=ssp-buffer-size=4\ -Wformat\ -Werror=format-security\ -D_FORTIFY_SOURCE=2 QMAKE_LFLAGS_RELEASE=-Wl,-z,relro QMAKE_LFLAGS_DEBUG=-Wl,-z,relro QMAKE_STRIP=: PREFIX=/usr -o Makefile ) && make -f Makefile
Project MESSAGE: QMAKE_HOST.arch: x86_64
Project MESSAGE: QT_ARCH: i386
Project MESSAGE: QUPZILLA_PREFIX:
Project MESSAGE: library folder /usr/lib/i386-linux-gnu
</pre>
(Build in a i386-build-chroot on a amd64 host)
This commit is contained in:
Alf Gaida 2014-07-07 01:11:33 +02:00
parent 7c7226b3f6
commit ca4acc48bf
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/defines.pri
View File

@ -28,6 +28,7 @@ d_use_lib_path = $$(USE_LIBPATH)
d_disable_dbus = $$(DISABLE_DBUS)
d_disable_updates_check = $$(DISABLE_UPDATES_CHECK)
d_debug_build = $$(DEBUG_BUILD)
d_prefix = $$(QUPZILLA_PREFIX)
equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL }
@ -104,22 +105,10 @@ else {
}
}
!mac:unix {
x86libpath = /usr/lib/i386-linux-gnu
x64libpath = /usr/lib/x86_64-linux-gnu
system_lib_path = /usr/lib
# QMAKE_HOST.arch is empty on x86
contains(QMAKE_HOST.arch, x86_64) {
exists($$x64libpath): system_lib_path = $$x64libpath
}
else {
exists($$x86libpath): system_lib_path = $$x86libpath
}
d_prefix = $$(QUPZILLA_PREFIX)
binary_folder = /usr/bin
library_folder = $$system_lib_path
library_folder = /usr/lib/$${QT_ARCH}-linux-gnu
data_folder = /usr/share/qupzilla
launcher_folder = /usr/share/applications
icon_folder = /usr/share/pixmaps