From a706f2fb580e86fd96f1d4c4d53d6e0c4cdc50df Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 23 Dec 2014 00:13:25 +0200 Subject: [PATCH] Set to prefix (/usr) if library prefix (/usr/lib) is empty and not just to default prefix. --HG-- branch : develop --- src/libs/qmuparser/qmuparser.pro | 11 ++++++++--- src/libs/vpropertyexplorer/vpropertyexplorer.pro | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 1c1e32709..f1f74ac6b 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -40,10 +40,15 @@ VERSION = 2.2.5 # Set "make install" command for Unix-like systems. unix:!macx{ isEmpty(PREFIX_LIB){ - contains(QMAKE_HOST.arch, x86_64) { - PREFIX_LIB = $$DEFAULT_PREFIX/lib64 + isEmpty(PREFIX){ + PR_LIB = $$DEFAULT_PREFIX } 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 diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index ab891e859..c7fab7c30 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -38,10 +38,15 @@ include(vpropertyexplorer.pri) # Set "make install" command for Unix-like systems. unix:!macx{ isEmpty(PREFIX_LIB){ - contains(QMAKE_HOST.arch, x86_64) { - PREFIX_LIB = $$DEFAULT_PREFIX/lib64 + isEmpty(PREFIX){ + PR_LIB = $$DEFAULT_PREFIX } 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