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
|
--- src/sage/env.py.orig 2014-06-25 10:47:25.827203554 +1200
+++ src/sage/env.py 2014-06-25 10:49:07.667402821 +1200
@@ -87,24 +87,21 @@
_add_variable_or_fallback('LOCAL_IDENTIFIER','$HOSTNAME.%s'%os.getpid())
# bunch of sage directories and files
-_add_variable_or_fallback('SAGE_ROOT', None)
-_add_variable_or_fallback('SAGE_LOCAL', opj('$SAGE_ROOT', 'local'))
-_add_variable_or_fallback('SAGE_ETC', opj('$SAGE_LOCAL', 'etc'))
-_add_variable_or_fallback('SAGE_INC', opj('$SAGE_LOCAL', 'include'))
-_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share'))
+_add_variable_or_fallback('SAGE_ROOT', '/usr')
+_add_variable_or_fallback('SAGE_LOCAL', '/usr')
+_add_variable_or_fallback('SAGE_ETC', '/etc/sage')
+_add_variable_or_fallback('SAGE_INC', opj('$SAGE_LOCAL', 'include', 'sage'))
+_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share', 'sage'))
_add_variable_or_fallback('SAGE_SRC', opj('$SAGE_ROOT', 'src'))
-_add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages())
+_add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages()+['/usr/lib/sage/site-packages'])
_add_variable_or_fallback('SAGE_LIB', SITE_PACKAGES[0])
_add_variable_or_fallback('SAGE_CYTHONIZED', opj('$SAGE_SRC', 'build', 'cythonized'))
-_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_DOC', opj('$SAGE_SRC', 'doc'))
-_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME','$SAGE_ROOT'), '.sage'))
-_add_variable_or_fallback('SAGE_DOT_GIT', opj('$SAGE_ROOT', '.git'))
+_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'ext'))
+_add_variable_or_fallback('SAGE_DOC', '/usr/share/doc/sage')
+_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME'), '.sage'))
_add_variable_or_fallback('SAGE_DISTFILES', opj('$SAGE_ROOT', 'upstream'))
# misc
|
