Set to prefix (/usr) if library prefix (/usr/lib) is empty and not just to

default prefix.

--HG--
branch : develop
This commit is contained in:
dismine 2014-12-23 00:13:25 +02:00
parent 9bfe1f3cd9
commit a706f2fb58
2 changed files with 16 additions and 6 deletions

View File

@ -40,10 +40,15 @@ VERSION = 2.2.5
# Set "make install" command for Unix-like systems. # Set "make install" command for Unix-like systems.
unix:!macx{ unix:!macx{
isEmpty(PREFIX_LIB){ isEmpty(PREFIX_LIB){
contains(QMAKE_HOST.arch, x86_64) { isEmpty(PREFIX){
PREFIX_LIB = $$DEFAULT_PREFIX/lib64 PR_LIB = $$DEFAULT_PREFIX
} else { } else {
PREFIX_LIB = $$DEFAULT_PREFIX/lib PR_LIB = $$PREFIX
}
contains(QMAKE_HOST.arch, x86_64) {
PREFIX_LIB = $$PR_LIB/lib64
} else {
PREFIX_LIB = $$PR_LIB/lib
} }
} }
target.path = $$PREFIX_LIB target.path = $$PREFIX_LIB

View File

@ -38,10 +38,15 @@ include(vpropertyexplorer.pri)
# Set "make install" command for Unix-like systems. # Set "make install" command for Unix-like systems.
unix:!macx{ unix:!macx{
isEmpty(PREFIX_LIB){ isEmpty(PREFIX_LIB){
contains(QMAKE_HOST.arch, x86_64) { isEmpty(PREFIX){
PREFIX_LIB = $$DEFAULT_PREFIX/lib64 PR_LIB = $$DEFAULT_PREFIX
} else { } else {
PREFIX_LIB = $$DEFAULT_PREFIX/lib PR_LIB = $$PREFIX
}
contains(QMAKE_HOST.arch, x86_64) {
PREFIX_LIB = $$PR_LIB/lib64
} else {
PREFIX_LIB = $$PR_LIB/lib
} }
} }
target.path = $$PREFIX_LIB target.path = $$PREFIX_LIB