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

Fixed make install issues on Linux. Closes #261

Browse Source
This commit is contained in:
nowrep 2012-02-20 22:34:09 +01:00
parent fc3b0ef068
commit 38b5a32bb9
5 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
defines.pri
View File

@ -34,10 +34,20 @@ equals(d_portable, "true") { DEFINES += PORTABLE_BUILD }
!mac:unix {
d_prefix = $$(QUPZILLA_PREFIX)
binary_folder = /usr/bin
library_folder = /usr/lib
data_folder = /usr/share/qupzilla
launcher_folder = /usr/share/applications
icon_folder = /usr/share/pixmaps
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
}
DEFINES += USE_DATADIR=\\\"""$$data_folder/"\\\""

29
install.pri
View File

@ -13,28 +13,8 @@ mac {
}
!mac:unix {
d_prefix = $$(QUPZILLA_PREFIX)
binary_folder = /usr/bin
library_folder = /usr/lib
data_folder = /usr/share/qupzilla
launcher_folder = /usr/share/applications
icon_folder = /usr/share/pixmaps
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
}
target.path = $$binary_folder
targetlib.files = $$PWD/bin/libqupzilla*
targetlib.path = $$library_folder
target1.files += $$PWD/bin/locale
target1.files += $$PWD/bin/themes
target1.path = $$data_folder
@ -63,13 +43,6 @@ mac {
ico256.files = $$PWD/linux/hicolor/256x256/apps/qupzilla.png
ico256.path = $$hicolor_folder/256x256/apps
INSTALLS += target targetlib target1 target2 target3
INSTALLS += target target1 target2 target3
INSTALLS += ico16 ico32 ico48 ico64 ico128 ico256
build_plugins {
targetplugins.files = $$PWD/bin/plugins/*.so
targetplugins.path = "$$library_folder"/qupzilla/
INSTALLS += targetplugins
}
}

2
main/main.pro
View File

@ -5,8 +5,8 @@ TARGET = qupzilla
TEMPLATE = app
LIBS += -L../bin -lqupzilla
include(../install.pri)
include(../defines.pri)
include(../install.pri)
include(../translations.pri)
include(../src/3rdparty/qtsingleapplication.pri)

8
plugins.pri
View File

@ -32,3 +32,11 @@ RCC_DIR = build
UI_DIR = build
LIBS += -L $$PWD/bin -lqupzilla
include(defines.pri)
!mac:unix {
target.path = $$library_folder/qupzilla
INSTALLS += target
}

6
src/src.pro
View File

@ -9,6 +9,12 @@ include(../defines.pri)
SOURCES -= main.cpp
!mac:unix {
target.path = $$library_folder
INSTALLS += target
}
message(========== Building libqupzilla ==========)
message( Using following defines:)
message($$DEFINES)