[sagemath] 04/06: Allow overriding SAGE_SRC.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit e6f59884e8e8c3366d84056a1466896d733f55d8
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Fri Dec 2 20:12:16 2016 +0000

    Allow overriding SAGE_SRC.
---
 debian/patches/debian-install-paths.patch | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/patches/debian-install-paths.patch b/debian/patches/debian-install-paths.patch
index eaa5a28..87190a8 100644
--- a/debian/patches/debian-install-paths.patch
+++ b/debian/patches/debian-install-paths.patch
@@ -47,7 +47,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  # Warn if NEW_SAGE_ROOT does not equal the old SAGE_ROOT
  if [ "$SAGE_ROOT" != "$NEW_SAGE_ROOT" -a -n "$SAGE_ROOT" ]; then
      echo >&2 "Warning: overwriting SAGE_ROOT environment variable:"
-@@ -420,8 +409,10 @@
+@@ -267,7 +256,9 @@
+ export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
+ export SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
+ export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
+-export SAGE_SRC="$SAGE_ROOT/src"
++if [ -z "$SAGE_SRC" ]; then
++    export SAGE_SRC="$SAGE_ROOT/src"
++fi
+ export SAGE_DOC_SRC="$SAGE_SRC/doc"
+ export SAGE_DOC="$SAGE_SHARE/doc/sage"
+ 
+@@ -420,8 +411,10 @@
      export PYTHONHOME
  fi
  

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