1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
Description: Allow SAGE_LOCAL to be overridden from outside the Makefiles
This makes it easier for package managers to create binary distributions.
However, keep SAGE_SPKG_INST relative to SAGE_ROOT rather than SAGE_LOCAL
since that would be a more intrusive change.
Author: Ximin Luo <infinity0@debian.org>
Forwarded: TODO
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/sage
+++ b/sage/sage
@@ -137,6 +137,8 @@
elif [ -x "$SAGE_ROOT/local/bin/sage" ]; then # if in a stripped binary
# Note in this case we assume that SAGE_LOCAL is the "local" subdirectory
exec "$SAGE_ROOT/local/bin/sage" "$@"
+elif [ -x "$SAGE_LOCAL/bin/sage" ]; then # if in a stripped binary
+ exec "$SAGE_LOCAL/bin/sage" "$@"
else
echo >&2 "$0: no Sage installation found in \$SAGE_ROOT=$SAGE_ROOT"
exit 1
--- a/sage/src/bin/sage-env
+++ b/sage/src/bin/sage-env
@@ -293,7 +293,7 @@
export SAGE_ETC="$SAGE_LOCAL/etc"
export SAGE_SHARE="$SAGE_LOCAL/share"
export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
-export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
+export SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
export SAGE_SPKG_SCRIPTS="$SAGE_LOCAL/var/lib/sage/scripts"
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
export SAGE_SRC="$SAGE_ROOT/src"
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
@@ -141,7 +141,7 @@
_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'sage', 'ext'))
_add_variable_or_fallback('SAGE_LOGS', opj('$SAGE_ROOT', 'logs', 'pkgs'))
-_add_variable_or_fallback('SAGE_SPKG_INST', opj('$SAGE_LOCAL', 'var', 'lib', 'sage', 'installed'))
+_add_variable_or_fallback('SAGE_SPKG_INST', opj('$SAGE_ROOT', 'local', 'var', 'lib', 'sage', 'installed'))
_add_variable_or_fallback('SAGE_DOC_SRC', opj('$SAGE_SRC', 'doc'))
_add_variable_or_fallback('SAGE_DOC', opj('$SAGE_SHARE', 'doc', 'sage'))
_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME','$SAGE_ROOT'), '.sage'))
--- a/sage/build/make/install
+++ b/sage/build/make/install
@@ -18,7 +18,7 @@
export SAGE_SHARE="$SAGE_LOCAL/share"
export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
-export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
+export SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
. "$SAGE_SRC"/bin/sage-version.sh
export SAGE_VERSION
@@ -28,7 +28,7 @@
fi
export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
-export PYTHONPATH="$SAGE_LOCAL"
+export PYTHONPATH="${PYTHONPATH:-SAGE_LOCAL}"
###############################################################################
# Skip the rest if nothing to do (i.e., to [re]build).
--- a/sage/configure.ac
+++ b/sage/configure.ac
@@ -96,7 +96,7 @@
SAGE_LOCAL=local
fi
SAGE_SRC="$SAGE_ROOT/src"
-SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
+SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
#---------------------------------------------------------
AX_CHECK_ROOT([AC_MSG_ERROR([You cannot build Sage as root, switch to an unpriviledged user])], [])
|
