[med-svn] [python-pbcore] 04/05: Clean up d/rules

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository python-pbcore.

commit fd1f781d4afbf09be4abee37d4eef3781fa300e0
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Sun Jun 7 16:27:02 2015 -0700

    Clean up d/rules
    
    I didn't set DESTDIR correctly in debian/rules, but my definition
    was being ignored anyway. Remove this declaration and declare
    a different variable, ROOT, to use as DESTDIR for within debian/rules,
    since DESTDIR apparently is not defined there.
---
 debian/rules | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8b98220..72f7246 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,16 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
-DESTDIR=`pwd`/debian/tmp/
-export DESTDIR
+# debhelper doesn't appear to define DESTDIR for debian/rules
+# call it "ROOT" here so it doesn't conflict with DESTDIR (it shouldn't anyway)
+ROOT=`pwd`/debian/$(DEB_SOURCE)
 
 %:
 	dh $@ --with python2
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod -x `pwd`/debian/$(DEB_SOURCE)/usr/lib/python2.7/dist-packages/pbcore/data/*.h5
+	chmod -x $(ROOT)/usr/lib/python2.7/dist-packages/pbcore/data/*.h5
 
 #get-orig-source:
 #	uscan

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-pbcore.git