[sagemath] 01/01: Hopefully fix installation for the new upstream build options

[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 2af9c75cef2ca272d5ad06ef9c54b15c2d2db36f
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jul 4 00:02:52 2017 +0200

    Hopefully fix installation for the new upstream build options
---
 debian/rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 6b35d2b..45378bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,9 @@ check-dochtml-log:
 	# Also filter out some false positives that are not hard errors.
 	! (grep Error sage/logs/dochtml.log | grep -v "citation not found: .*Error.*")
 
+override_dh_auto_configure:
+	dh_auto_configure -Dsage -- --prefix=$(SAGE_LOCAL)
+
 # We build everything in both -arch and -indep because the tests need the docs.
 # TODO: as described in #849150, we can make this more efficient if we figure
 # out how to disable the tests that need the docs.
@@ -157,9 +160,9 @@ override_dh_auto_install:
 # we don't distribute them.
 	find debian/build '(' -name '*.pyc' -o -name '*.pyo' ')' -delete
 	rm -f debian/build/usr/bin/*.bat
-	cp -f debian/adhoc/sage-env debian/build/usr/bin/
 	mkdir -p debian/tmp
 	mv debian/build/* debian/tmp
+	cp -f debian/adhoc/sage-env debian/tmp/usr/bin/
 # Don't try to rmdir debian/build if it's a mountpoint, useful for doing builds in /run/shm
 	mountpoint debian/build || rmdir debian/build
 

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