[sagemath] 02/04: Improve debian/rules, avoid double building/pruning.

Tobias Hansen thansen at moszumanska.debian.org
Thu Mar 5 11:20:22 UTC 2015


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

thansen pushed a commit to branch master
in repository sagemath.

commit 2c38a3f6a0fbe32ae250d9983f839afd6975bb7b
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Mon Mar 2 23:20:20 2015 +0100

    Improve debian/rules, avoid double building/pruning.
---
 debian/rules | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index 47a01a5..32598e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,18 +7,12 @@ export MAKE = make -j4
 	dh $@
 
 override_dh_auto_clean:
+	rm -f prune-stamp
 	rm -f config.log config.status pruner.py
 	rm -f debian/pruner/configure
 	dh_auto_clean
 
-override_dh_auto_configure: prune
-
-override_dh_auto_build:
-	$(MAKE) --directory=sage
-
-override_dh_auto_test: test
-
-test: override_dh_auto_configure
+override_dh_auto_build: prune-stamp
 	$(MAKE) --directory=sage ptestlong
 
 override_dh_auto_install:
@@ -26,7 +20,10 @@ override_dh_auto_install:
 get-orig-source:
 	cd sage && git archive --prefix=sagemath_$(VERSION)/sage/ --format=tar HEAD | xz -zf > ../../sagemath_$(VERSION).orig.tar.xz
 
-prune:
+prune: prune-stamp
+
+prune-stamp:
 	cd debian/pruner && autoconf
 	debian/pruner/configure --with-sage-root="$(shell pwd)/sage"
 	cd sage && python ../pruner.py
+	touch prune-stamp

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



More information about the debian-science-commits mailing list