[sagemath] 02/03: Make TRY_AVOID_REBUILD work properly

[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 63e8f916ede66ce02fec8b9e646b87238d8d2cbf
Author: Ximin Luo <infinity0 at debian.org>
Date:   Wed Aug 9 06:42:27 2017 +0200

    Make TRY_AVOID_REBUILD work properly
---
 debian/rules | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index f5c626a..9194f76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,10 +37,8 @@ else
 NUMJOBS = 1
 endif
 
-ifeq (1,$(TRY_AVOID_REBUILD))
+ifneq (1,$(TRY_AVOID_REBUILD))
 REBUILD_RULES = debian/rules
-else
-REBUILD_RULES =
 endif
 
 %:
@@ -268,6 +266,10 @@ install-apt-sources:
 	  | sudo tee /etc/apt/preferences.d/deb-sci-sage
 	sudo apt-get update
 
+ifneq (1,$(TRY_AVOID_REBUILD))
+REBUILD_RELEASE = ../sagemath_$(DEB_VERSION).dsc
+endif
+
 # Temporary workarounds that will be removed eventually:
 #
 # 1 echo "/var/cache/apt/archives /var/cache/apt/archives none rw,bind 0 0" >> /etc/schroot/sbuild/fstab
@@ -275,7 +277,7 @@ install-apt-sources:
 #
 # 2 Do the first part of https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817236#5
 #   Sage needs it due to its pexpect etc stuff
-release: ../sagemath_$(DEB_VERSION).dsc
+release: $(REBUILD_RELEASE)
 	! $(is_prerelease)
 	cd .. && sbuild \
 	  --build-dep-resolver=aspcud \
@@ -283,7 +285,7 @@ release: ../sagemath_$(DEB_VERSION).dsc
 	  $(EXTRA_SBUILD_FLAGS) \
 	  "sagemath_$(DEB_VERSION).dsc"
 
-release-experimental: ../sagemath_$(DEB_VERSION).dsc
+release-experimental: $(REBUILD_RELEASE)
 	! $(is_prerelease)
 	cd .. && sbuild \
 	  --extra-repository='deb http://httpredir.debian.org/debian experimental main' \
@@ -292,7 +294,7 @@ release-experimental: ../sagemath_$(DEB_VERSION).dsc
 	  $(EXTRA_SBUILD_FLAGS) \
 	  "sagemath_$(DEB_VERSION).dsc"
 
-release-deb-sci-sage: ../sagemath_$(DEB_VERSION).dsc
+release-deb-sci-sage: $(REBUILD_RELEASE)
 	$(is_prerelease)
 	cd .. && sbuild \
 	  --extra-repository='deb http://httpredir.debian.org/debian experimental main' \

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