[sagemath] 01/03: More robust/standard debian rules

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit 9a9e3e3a89eb3eda274da369bf304a9fc5b7376e
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Aug 9 02:36:00 2016 +0200

    More robust/standard debian rules
    
    - build documentation again, unless nodoc is in DEB_BUILD_OPTIONS
    - clean all build products; for Sage this is 'distclean' not 'clean'
    - have reset depend on clean instead of using $(MAKE)
---
 debian/rules | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index f9f54fc..d9f409e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,17 +9,26 @@ else
 	export MAKE = make -j5
 endif
 
+ifneq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+	DEB_BUILD_TARGET = build
+else
+	DEB_BUILD_TARGET = all
+endif
 
 %:
 	dh $@ --parallel
 
 override_dh_auto_build: prune
-	$(MAKE) --directory=sage build
+	$(MAKE) --directory=sage $(DEB_BUILD_TARGET)
 
 override_dh_auto_test: ptestlong
 
 override_dh_auto_install:
 
+# upstream "clean" only cleans the sagelib build and not e.g. spkg builds
+override_dh_auto_clean:
+	$(MAKE) --directory=sage distclean
+
 get-orig-source:
 	cd sage && git archive --prefix=sagemath_$(DEB_VERSION_UPSTREAM)/sage/ \
 	  --format=tar HEAD | xz -zf > ../../sagemath_$(DEB_VERSION_UPSTREAM).orig.tar.xz
@@ -34,8 +43,7 @@ ptestlong:
 	cd sage && local/bin/sage-starts
 	cd sage && ./sage -t -p --all --long --logfile=logs/ptestlong.log
 
-reset:
-	$(MAKE) -f debian/rules clean
+reset: clean
 	QUILT_PATCHES=debian/patches quilt pop -af || true
 	cd sage; git clean -fdx
 	rm -rf $$HOME/.sage/local

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