From 8c4e4364cd81444ae9b8e0d09bf91cd25dabe2ce Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Thu, 22 Jan 2015 01:35:38 +0100 Subject: [PATCH] pkg/deb: install libraries to lib Recent cmake versions (starting with 3.0) don't use multiarch libdir when the install prefix is not /usr. To have the same library directory for all packages explicitly set CMAKE_INSTALL_LIBDIR to lib. --- packaging/deb/freerdp-nightly/freerdp-nightly-dev.install | 4 +++- packaging/deb/freerdp-nightly/freerdp-nightly.install | 2 +- packaging/deb/freerdp-nightly/rules | 8 +++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install b/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install index 5c604b138..11d3295cf 100644 --- a/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install +++ b/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install @@ -1,2 +1,4 @@ -opt/freerdp-nightly/lib +opt/freerdp-nightly/lib/*.so +opt/freerdp-nightly/lib/pkgconfig +opt/freerdp-nightly/lib/cmake opt/freerdp-nightly/include diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly.install b/packaging/deb/freerdp-nightly/freerdp-nightly.install index d4faef614..763bff012 100644 --- a/packaging/deb/freerdp-nightly/freerdp-nightly.install +++ b/packaging/deb/freerdp-nightly/freerdp-nightly.install @@ -1,3 +1,3 @@ -opt/freerdp-nightly/lib +opt/freerdp-nightly/lib/*.so.* opt/freerdp-nightly/bin opt/freerdp-nightly/share/man/man1/xfreerdp.1* diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules index e88f076d0..12a885390 100755 --- a/packaging/deb/freerdp-nightly/rules +++ b/packaging/deb/freerdp-nightly/rules @@ -24,7 +24,8 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_RPATH=FALSE \ -DBUILD_TESTING=OFF \ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \ -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \ - -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \ + -DCMAKE_INSTALL_INCLUDEDIR=include \ + -DCMAKE_INSTALL_LIBDIR=lib \ $(ARM_FLOAT_ABI) \ $(NULL) @@ -35,19 +36,16 @@ override_dh_auto_configure: dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) override_dh_shlibdeps: - dh_shlibdeps -l /opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/ + dh_shlibdeps -l /opt/freerdp-nightly/lib/ override_dh_strip: dh_strip --dbg-package=freerdp-nightly-dbg override_dh_install: - rm -f debian/tmp/opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/libwinpr-makecert-tool.a - rm -f debian/tmp/opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/freerdp/*.a rm -f debian/tmp/opt/freerdp-nightly/lib/libwinpr-makecert-tool.a rm -f debian/tmp/opt/freerdp-nightly/lib/freerdp/*.a dh_install --fail-missing override_dh_clean: - rm -f include/version.h rm -f config.h dh_clean