From 61067f7f87da4e8cfe3ee29e8769a9cf47837aad Mon Sep 17 00:00:00 2001 From: Wook Song Date: Mon, 26 Nov 2018 10:25:22 +0900 Subject: [PATCH] [Dist/Debian] Change installation directories based on multiarch scheme This patch, based on the multiarch directory scheme of Debian/Ubuntu, chages the installation directories of nnstreamer and nnstreamer development packages. Signed-off-by: Wook Song --- CMakeLists.txt | 4 ++-- debian/control | 2 ++ debian/nnstreamer-dev.install | 6 +++--- debian/nnstreamer.install | 4 ++-- debian/rules | 7 +++++++ 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 434e4ab..f415cee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,12 +17,12 @@ SET(INCLUDE_INSTALL_DIR "${PREFIX}/include") IF(LIB_INSTALL_DIR) ELSE(LIB_INSTALL_DIR) - SET(LIB_INSTALL_DIR "${PREFIX}/lib") + SET(LIB_INSTALL_DIR "${PREFIX}/${CMAKE_INSTALL_LIBDIR}") ENDIF(LIB_INSTALL_DIR) IF(GST_INSTALL_DIR) ELSE(GST_INSTALL_DIR) - SET(GST_INSTALL_DIR "${PREFIX}/lib/gstreamer-1.0") + SET(GST_INSTALL_DIR "${LIB_INSTALL_DIR}/gstreamer-1.0") ENDIF(GST_INSTALL_DIR) FIND_PACKAGE(PkgConfig REQUIRED) diff --git a/debian/control b/debian/control index a42bc28..0377309 100644 --- a/debian/control +++ b/debian/control @@ -13,12 +13,14 @@ Homepage: https://github.com/nnsuite/nnstreamer Package: nnstreamer Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} Description: NNStreamer plugins for Gstreamer Gstreamer plugins, "NNStreamer", provides access to nerual network frameworks for media streams Package: nnstreamer-dev Architecture: any +Multi-Arch: same Depends: nnstreamer Description: NNStreamer development package Gstreamer plugins, "NNStreamer", provides access to nerual network frameworks for media streams diff --git a/debian/nnstreamer-dev.install b/debian/nnstreamer-dev.install index c8a68eb..ab6d0f5 100644 --- a/debian/nnstreamer-dev.install +++ b/debian/nnstreamer-dev.install @@ -1,4 +1,4 @@ /usr/include/nnstreamer/*.h -/usr/lib/pkgconfig/*.pc -/usr/lib/libnnstreamer.a -/usr/lib/libtensor_filter*.a +/usr/lib/*/pkgconfig/*.pc +/usr/lib/*/libnnstreamer.a +/usr/lib/*/libtensor_filter*.a diff --git a/debian/nnstreamer.install b/debian/nnstreamer.install index a12f5f3..dde19c8 100644 --- a/debian/nnstreamer.install +++ b/debian/nnstreamer.install @@ -1,2 +1,2 @@ -/usr/lib/libtensor_filter_tflitecore.so -/usr/lib/gstreamer-1.0/*.so +/usr/lib/*/libtensor_filter_tflitecore.so +/usr/lib/*/gstreamer-1.0/*.so diff --git a/debian/rules b/debian/rules index 38ffe17..5be3de9 100755 --- a/debian/rules +++ b/debian/rules @@ -13,5 +13,12 @@ # package maintainers to append LDFLAGS #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + %: dh $@ --buildsystem=cmake --builddirectory=build --parallel + +NNS_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) + +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR=$(NNS_INSTALL_LIBDIR) -- 2.7.4