mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-21 11:19:02 -04:00
Also: - Remove configparser dependencies (bz 1706597). - Fix broken sed conversion (bz 1706234). - Fix python2 versus python3 snafu (bz 1706337, 1707166). - Build and install sagetex (bz 1706322).
41 lines
2.2 KiB
Diff
41 lines
2.2 KiB
Diff
diff -up src/sage/env.py.orig src/sage/env.py
|
|
--- src/sage/env.py.orig 2019-06-27 11:45:30.915744723 -0600
|
|
+++ src/sage/env.py 2019-06-28 11:31:09.965474086 -0600
|
|
@@ -151,11 +151,11 @@ var('SAGE_DATE', version.date)
|
|
var('SAGE_VERSION_BANNER', version.banner)
|
|
|
|
# bunch of sage directories and files
|
|
-var('SAGE_LOCAL', os.path.abspath(sys.prefix))
|
|
-var('SAGE_ETC', join(SAGE_LOCAL, 'etc'))
|
|
-var('SAGE_INC', join(SAGE_LOCAL, 'include'))
|
|
-var('SAGE_SHARE', join(SAGE_LOCAL, 'share'))
|
|
-var('SAGE_DOC', join(SAGE_SHARE, 'doc', 'sage'))
|
|
+var('SAGE_LOCAL', '@@SAGE_LOCAL@@')
|
|
+var('SAGE_ETC', join('/usr', 'share', 'sagemath', 'etc'))
|
|
+var('SAGE_INC', join('/usr', 'include'))
|
|
+var('SAGE_SHARE', join('/usr', 'share', 'sagemath'))
|
|
+var('SAGE_DOC', join('/usr', 'share', 'doc', 'sagemath'))
|
|
var('SAGE_SPKG_INST', join(SAGE_LOCAL, 'var', 'lib', 'sage', 'installed'))
|
|
var('SAGE_LIB', os.path.dirname(os.path.dirname(sage.__file__)))
|
|
|
|
@@ -169,7 +169,7 @@ var('DOT_SAGE', join(os.envir
|
|
var('SAGE_STARTUP_FILE', join(DOT_SAGE, 'init.sage'))
|
|
|
|
# installation directories for various packages
|
|
-var('SAGE_EXTCODE', join(SAGE_SHARE, 'sage', 'ext'))
|
|
+var('SAGE_EXTCODE', join('/usr', 'share', 'sagemath', 'etc'))
|
|
var('CONWAY_POLYNOMIALS_DATA_DIR', join(SAGE_SHARE, 'conway_polynomials'))
|
|
var('GRAPHS_DATA_DIR', join(SAGE_SHARE, 'graphs'))
|
|
var('ELLCURVE_DATA_DIR', join(SAGE_SHARE, 'ellcurves'))
|
|
@@ -181,9 +181,9 @@ var('CREMONA_MINI_DATA_DIR', joi
|
|
var('CREMONA_LARGE_DATA_DIR', join(SAGE_SHARE, 'cremona'))
|
|
var('JMOL_DIR', join(SAGE_SHARE, 'jmol'))
|
|
var('JSMOL_DIR', join(SAGE_SHARE, 'jsmol'))
|
|
-var('MATHJAX_DIR', join(SAGE_SHARE, 'mathjax'))
|
|
+var('MATHJAX_DIR', join('/usr', 'share', 'javascript', 'mathjax'))
|
|
var('THREEJS_DIR', join(SAGE_SHARE, 'threejs'))
|
|
-var('PPLPY_DOCS', join(SAGE_SHARE, 'doc', 'pplpy'))
|
|
+var('PPLPY_DOCS', join('/usr', 'share', 'doc', 'python3-pplpy'))
|
|
var('MAXIMA_FAS')
|
|
|
|
# misc
|