From 013a8d7cfdc170602a50510915168d6644683fe0 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 21 Nov 2014 14:01:35 +0200 Subject: [PATCH] Broken make install path for library if prefix doesn't default. --HG-- branch : develop --- README.txt | 10 +++++++++- src/libs/qmuparser/qmuparser.pro | 8 +++++++- src/libs/vpropertyexplorer/vpropertyexplorer.pro | 8 +++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/README.txt b/README.txt index 48c3fd03b..33c10eee0 100644 --- a/README.txt +++ b/README.txt @@ -45,7 +45,7 @@ The installed toolchains have to match the one Qt was compiled with. You can build Valentina with cd $SOURCE_DIRECTORY - qmake -r + qmake Valentina.pro -r (or qmake-qt5, depending on your platform) make (or mingw32-make or nmake or jom, depending on your platform) Note:In order to build and use Valentina, the PATH environment variable @@ -61,6 +61,14 @@ You may also need to ensure that the locations of your compiler and other build tools are listed in the PATH variable. This will depend on your choice of software development environment. +Unix systems: +Default prefix for command "make install" is /usr. For using another +prefix build with qmake command: + +qmake PREFIX=/usr/local Valentina.pro -r + +where /usr/local is a new prefix for installation. + LICENSING ========== Valentina is free software: you can redistribute it and/or modify diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 163ab5d40..f6fb679a9 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -67,9 +67,15 @@ unix:!macx{ } else { PREFIX = $$DEFAULT_PREFIX/lib } + target.path = $$PREFIX + } else { + contains(QMAKE_HOST.arch, x86_64) { + target.path = $$PREFIX/lib64 + } else { + target.path = $$PREFIX/lib + } } - target.path = $$PREFIX INSTALLS += target } diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 9d9a2f27d..ffa6195a1 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -109,9 +109,15 @@ unix:!macx{ } else { PREFIX = $$DEFAULT_PREFIX/lib } + target.path = $$PREFIX + } else { + contains(QMAKE_HOST.arch, x86_64) { + target.path = $$PREFIX/lib64 + } else { + target.path = $$PREFIX/lib + } } - target.path = $$PREFIX INSTALLS += target }