[opencv] 07/08: d/rules: use a single cp call to copy the static libs

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository opencv.

commit b62a626613a8c22a22cbf1303384ea15ef3cd94d
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Apr 23 20:48:47 2017 +0200

    d/rules: use a single cp call to copy the static libs
    
    This also makes the build properly fail in case of cp fails
    
    Gbp-Dch: Short
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 64b7176..e9d9b6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,8 +121,8 @@ override_dh_install:
 	sed -i -e "s at share\/OpenCV\/java\/@lib\/jni\/@g" \
 		debian/tmp/usr/share/OpenCV/OpenCVModules-release.cmake
 
-	for f in $$(ls obj-*/lib/libopencv_*.a); do \
-		cp --verbose --preserve=mode $$f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/; done
+	# put the static libs together with the rest of the stuff
+	cp -v $(BUILDDIR)-static/lib/*.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 
 	rm -rf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*_pch_dephelp.a
 	rm -rf debian/tmp/usr/share/OpenCV/doc/html/jquery.js

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