From 2ccb7ca7970992ed3726487b4b56a190220662b0 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 7 Dec 2014 13:31:34 +0200 Subject: [PATCH] First attempt fix issue #197. --HG-- branch : develop --- dist/debian/rules | 8 +++++--- dist/debian/valentina.install | 2 +- src/libs/qmuparser/qmuparser.pro | 15 ++++----------- src/libs/vpropertyexplorer/vpropertyexplorer.pro | 15 ++++----------- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dist/debian/rules b/dist/debian/rules index e0ac743b0..67a7f677f 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -7,16 +7,18 @@ DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) ifeq ($(DEB_HOST_ARCH),amd64) - LIBPATH:= /debian/tmp/usr/lib64 + LIBPATH:= /debian/tmp/usr/lib/x86_64-linux-gnu + PREFIX_LIB:= /usr/lib/x86_64-linux-gnu else - LIBPATH:= /debian/tmp/usr/lib + LIBPATH:= /debian/tmp/usr/lib/i386-linux-gnu + PREFIX_LIB:= /usr/lib/i386-linux-gnu endif builddir: mkdir -p builddir builddir/Makefile: builddir - cd builddir && qmake PREFIX=/usr ../$(APPNAME).pro -r + cd builddir && qmake PREFIX=/usr PREFIX_LIB=$(PREFIX_LIB) ../$(APPNAME).pro -r build: build-stamp build-stamp: builddir/Makefile dh_testdir diff --git a/dist/debian/valentina.install b/dist/debian/valentina.install index d9e1b1a92..d27f943f0 100644 --- a/dist/debian/valentina.install +++ b/dist/debian/valentina.install @@ -1,5 +1,5 @@ usr/bin/* -usr/lib* +usr/lib/* usr/share/valentina/translations/* usr/share/valentina/tables/standard/* usr/share/pixmaps/* diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index e6d3fa152..f26d71830 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -39,21 +39,14 @@ VERSION = 2.2.5 # Set "make install" command for Unix-like systems. unix:!macx{ - isEmpty(PREFIX){ + isEmpty(PREFIX_LIB){ contains(QMAKE_HOST.arch, x86_64) { - PREFIX = $$DEFAULT_PREFIX/lib64 + PREFIX_LIB = $$DEFAULT_PREFIX/lib64 } else { - PREFIX = $$DEFAULT_PREFIX/lib - } - target.path = $$PREFIX - } else { - contains(QMAKE_HOST.arch, x86_64) { - target.path = $$PREFIX/lib64 - } else { - target.path = $$PREFIX/lib + PREFIX_LIB = $$DEFAULT_PREFIX/lib } } - + target.path = $$PREFIX_LIB INSTALLS += target } diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index fb0b4a2a2..64de63e2a 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -37,21 +37,14 @@ include(vpropertyexplorer.pri) # Set "make install" command for Unix-like systems. unix:!macx{ - isEmpty(PREFIX){ + isEmpty(PREFIX_LIB){ contains(QMAKE_HOST.arch, x86_64) { - PREFIX = $$DEFAULT_PREFIX/lib64 + PREFIX_LIB = $$DEFAULT_PREFIX/lib64 } else { - PREFIX = $$DEFAULT_PREFIX/lib - } - target.path = $$PREFIX - } else { - contains(QMAKE_HOST.arch, x86_64) { - target.path = $$PREFIX/lib64 - } else { - target.path = $$PREFIX/lib + PREFIX_LIB = $$DEFAULT_PREFIX/lib } } - + target.path = $$PREFIX_LIB INSTALLS += target }