don't export GP_DATA_DIR, remove other, unneeded GP* vars

GP_DATA_DIR is a gp (from PARI/GP) env. variable, overriding the default datadir location. No need to change or set it. GPHELP and GPDOCDIR are not used anywhere, so they simply can go.
sagemath · Aug 7, 2019 · ac207d5 · ac207d5
1 parent 6eac550
commit ac207d5
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 11 deletions.
diff --git a/build/pkgs/pari_elldata/spkg-install b/build/pkgs/pari_elldata/spkg-install
@@ -1 +1 @@
-sdh_install src/* "$GP_DATA_DIR"
+sdh_install src/* "$SAGE_LOCAL/share/pari"
diff --git a/build/pkgs/pari_galdata/spkg-install b/build/pkgs/pari_galdata/spkg-install
@@ -1 +1 @@
-sdh_install src/* "$GP_DATA_DIR"
+sdh_install src/* "$SAGE_LOCAL/share/pari"
diff --git a/build/pkgs/pari_galpol/spkg-install b/build/pkgs/pari_galpol/spkg-install
@@ -1 +1 @@
-sdh_install src/* "$GP_DATA_DIR"
+sdh_install src/* "$SAGE_LOCAL/share/pari"
diff --git a/build/pkgs/pari_nftables/spkg-install b/build/pkgs/pari_nftables/spkg-install
@@ -1 +1 @@
-sdh_install src/* "$GP_DATA_DIR/nftables"
+sdh_install src/* "$SAGE_LOCAL/share/pari/nftables"
diff --git a/build/pkgs/pari_seadata/spkg-install b/build/pkgs/pari_seadata/spkg-install
@@ -1 +1 @@
-sdh_install src/* "$GP_DATA_DIR"
+sdh_install src/* "$SAGE_LOCAL/share/pari"
diff --git a/build/pkgs/pari_seadata_small/spkg-install b/build/pkgs/pari_seadata_small/spkg-install
@@ -1 +1 @@
-sdh_install src/* "$GP_DATA_DIR"
+sdh_install src/* "$SAGE_LOCAL/share/pari"
diff --git a/src/bin/sage-env b/src/bin/sage-env
@@ -350,11 +350,6 @@ if [ -n "$MULTI_ARCH" ]; then
     CPATH="${CPATH}:/usr/include/$MULTI_ARCH"
 fi
 
-# For PARI/GP
-GP_DATA_DIR="$SAGE_LOCAL/share/pari" && export GP_DATA_DIR
-GPHELP="$SAGE_LOCAL/bin/gphelp" && export GPHELP
-GPDOCDIR="$SAGE_LOCAL/share/pari/doc" && export GPDOCDIR
-
 SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
 SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		sdh_install src/* "$GP_DATA_DIR"
		sdh_install src/* "$SAGE_LOCAL/share/pari"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		sdh_install src/* "$GP_DATA_DIR/nftables"
		sdh_install src/* "$SAGE_LOCAL/share/pari/nftables"