diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-12-10 15:31:48 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-12-10 15:33:30 +0100 |
| commit | aee953ec8d37647c0178ed730a35082277be7332 (patch) | |
| tree | 0e02dbbe67a3624a4aa2abca951ab3bb6daaf32a | |
| parent | 7771106fa4afce593ef32504c223d0da2b2fe465 (diff) | |
| download | tde-packaging-aee953ec8d37647c0178ed730a35082277be7332.tar.gz tde-packaging-aee953ec8d37647c0178ed730a35082277be7332.zip | |
DEB tqtinterface: Set CMAKE_INSTALL_LIBDIR independently of GNUInstallDirs.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 826b3da47710bc716fe9f1b2747d245927d3ee74)
| -rwxr-xr-x | debian/_base/dependencies/tqtinterface/debian/rules | 8 | ||||
| -rwxr-xr-x | ubuntu/_base/dependencies/tqtinterface/debian/rules | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules index 530f77b52..1e56fa6e0 100755 --- a/debian/_base/dependencies/tqtinterface/debian/rules +++ b/debian/_base/dependencies/tqtinterface/debian/rules @@ -6,11 +6,17 @@ include debian/cdbs/debian-tde.mk version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ -DWITH_QT3="ON" diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules index 530f77b52..1e56fa6e0 100755 --- a/ubuntu/_base/dependencies/tqtinterface/debian/rules +++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules @@ -6,11 +6,17 @@ include debian/cdbs/debian-tde.mk version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ -DWITH_QT3="ON" |