From 4686d39c33f2930106c1d857fc0acec7746506ff Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 22 Jan 2019 10:28:29 +0100 Subject: cmake: place include/ and share/ in /usr (debian packages) Change-Id: I980b76fb766d5734d4e822409a11ed09a06108a6 Signed-off-by: Damjan Marion --- src/pkg/debian/rules.in | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/pkg') diff --git a/src/pkg/debian/rules.in b/src/pkg/debian/rules.in index 373c66ecaee..f1917e6ea0a 100755 --- a/src/pkg/debian/rules.in +++ b/src/pkg/debian/rules.in @@ -23,7 +23,7 @@ override_dh_strip: DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_install: - for c in @VPP_COMPONENTS@; do \ + @for c in @VPP_COMPONENTS@; do \ @CMAKE_COMMAND@ \ -D CMAKE_INSTALL_CONFIG_NAME=@CMAKE_BUILD_TYPE@ \ -D CMAKE_INSTALL_COMPONENT=$$c \ @@ -34,8 +34,13 @@ override_dh_install: mkdir -p debian/$$c/usr/lib ; \ mv debian/$$c/$(DEB_HOST_MULTIARCH) debian/$$c/usr/lib ; \ fi ; \ - if [ -d debian/$$c/bin ] ; then \ - mv debian/$$c/bin debian/$$c/usr/bin ; \ + for d in bin include share ; do \ + if [ -d debian/$$c/$$d ] ; then \ + mkdir -p debian/$$c/usr ; \ + mv debian/$$c/$$d debian/$$c/usr/$$d ; \ + fi ; \ + done ; \ + if [ -d debian/$$c ] ; then \ + @CMAKE_SOURCE_DIR@/scripts/remove-rpath debian/$$c ; \ fi ; \ - @CMAKE_SOURCE_DIR@/scripts/remove-rpath debian/$$c ; \ done -- cgit 1.2.3-korg