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:31:53 +0100 |
| commit | 0ef342fc6b0ec7fe55b60769c61607750d3a21d8 (patch) | |
| tree | eccfcb07d068245e2cf72057d70cf8c974d95afc | |
| parent | 90e95bdd7453bd43b7a17480cb086f26e624c1dd (diff) | |
| download | tde-packaging-0ef342fc6b0ec7fe55b60769c61607750d3a21d8.tar.gz tde-packaging-0ef342fc6b0ec7fe55b60769c61607750d3a21d8.zip | |
DEB tqtinterface: Set CMAKE_INSTALL_LIBDIR independently of GNUInstallDirs.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rwxr-xr-x | debian/_base/dependencies/tqtinterface/debian/rules | 9 | ||||
| -rwxr-xr-x | ubuntu/_base/dependencies/tqtinterface/debian/rules | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules index 5772f17f6..0db17ad7b 100755 --- a/debian/_base/dependencies/tqtinterface/debian/rules +++ b/debian/_base/dependencies/tqtinterface/debian/rules @@ -7,8 +7,15 @@ include debian/cdbs/debian-tde.mk version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) +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_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules index 5772f17f6..0db17ad7b 100755 --- a/ubuntu/_base/dependencies/tqtinterface/debian/rules +++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules @@ -7,8 +7,15 @@ include debian/cdbs/debian-tde.mk version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) +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_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) |