[odb-api] 13/19: fix paths in install

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository odb-api.

commit 11d6306b285e4828afa1e14db0f486d39f07311a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Sep 1 11:14:28 2017 +0100

    fix paths in install
---
 debian/rules | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index ab0bfad..1137fd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,10 @@ export DH_VERBOSE=1
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 AUTOGENERATED:= libodb-api-0d.install libodb-api-dev.install libodb-api-dev.links
 LIBDIR:=/usr/lib/${DEB_HOST_MULTIARCH}
+DESTDIR:=$(shell pwd)/debian/tmp
 
 CMAKE_DIR_ECKIT:=debian/tmp/usr/share/eckit/cmake
-CMAKE_DIR_ODBAPI:=debian/tmp/share/odb_api/cmake
+CMAKE_DIR_ODBAPI:=debian/tmp/usr/share/odb_api/cmake
 
 CMAKE_CFLAGS:= \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -38,10 +39,10 @@ override_dh_auto_test:
 	# dh_auto_test ||  @echo "Ignoring test failures" 
 
 override_dh_auto_install:
-	cd obj-* && $(MAKE) install
-	for d in debian/tmp/bin/* ; do \
+	cd obj-* && $(MAKE) install DESTDIR=$(DESTDIR)
+	for d in debian/tmp/usr/bin/* ; do \
 		( chrpath -d $$d || echo "Ignoring non-ELF file errors") ; done
-	chrpath -d debian/tmp/lib/*.0d
+	chrpath -d debian/tmp/usr/lib/*.0d
 	dh_auto_install	
 	# Fix broken paths 
 	cat ${CMAKE_DIR_ECKIT}/eckit-targets-release.cmake | \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/odb-api.git