aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First attempt fix issue #197.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-12-07 13:31:34 +02:00
parent 1cf19a8e3b
commit 2ccb7ca797
4 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/debian/rules vendored
View File

@ -7,16 +7,18 @@
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq ($(DEB_HOST_ARCH),amd64) 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 else
LIBPATH:= /debian/tmp/usr/lib LIBPATH:= /debian/tmp/usr/lib/i386-linux-gnu
PREFIX_LIB:= /usr/lib/i386-linux-gnu
endif endif
builddir: builddir:
mkdir -p builddir mkdir -p builddir
builddir/Makefile: 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: build-stamp
build-stamp: builddir/Makefile build-stamp: builddir/Makefile
dh_testdir dh_testdir

2
dist/debian/valentina.install vendored
View File

@ -1,5 +1,5 @@
usr/bin/* usr/bin/*
usr/lib* usr/lib/*
usr/share/valentina/translations/* usr/share/valentina/translations/*
usr/share/valentina/tables/standard/* usr/share/valentina/tables/standard/*
usr/share/pixmaps/* usr/share/pixmaps/*

15
src/libs/qmuparser/qmuparser.pro
View File

@ -39,21 +39,14 @@ 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){ isEmpty(PREFIX_LIB){
contains(QMAKE_HOST.arch, x86_64) { contains(QMAKE_HOST.arch, x86_64) {
PREFIX = $$DEFAULT_PREFIX/lib64 PREFIX_LIB = $$DEFAULT_PREFIX/lib64
} else { } else {
PREFIX = $$DEFAULT_PREFIX/lib PREFIX_LIB = $$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_LIB
INSTALLS += target INSTALLS += target
} }

15
src/libs/vpropertyexplorer/vpropertyexplorer.pro
View File

@ -37,21 +37,14 @@ 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){ isEmpty(PREFIX_LIB){
contains(QMAKE_HOST.arch, x86_64) { contains(QMAKE_HOST.arch, x86_64) {
PREFIX = $$DEFAULT_PREFIX/lib64 PREFIX_LIB = $$DEFAULT_PREFIX/lib64
} else { } else {
PREFIX = $$DEFAULT_PREFIX/lib PREFIX_LIB = $$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_LIB
INSTALLS += target INSTALLS += target
} }