Move SAGE_PKG_CONFIG_PATH, SAGE_NAUTY_BINS_PREFIX back to src/bin/sag…

…e-env-config.in
sagemath · Feb 27, 2020 · 2ab9b09 · 2ab9b09
1 parent 8bd4f53
commit 2ab9b09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/build/bin/sage-build-env-config.in b/build/bin/sage-build-env-config.in
@@ -85,12 +85,3 @@ export SAGE_PARI_CFG="@SAGE_PARI_CFG@"
 export SAGE_GLPK_PREFIX="@SAGE_GLPK_PREFIX@"
 export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@"
 export SAGE_ARB_LIBRARY="@SAGE_ARB_LIBRARY@"
-
-export SAGE_PKG_CONFIG_PATH="@SAGE_PKG_CONFIG_PATH@"
-if [ -n "$SAGE_PKG_CONFIG_PATH" ]; then
-    # set up external pkg-config to look into SAGE_LOCAL/lib/pkgconfig/
-    # (Sage's pkgconf spkg takes care of this, if installed)
-    export PKG_CONFIG_PATH="$SAGE_PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
-fi
-
-export SAGE_NAUTY_BINS_PREFIX="@SAGE_NAUTY_BINS_PREFIX@"
diff --git a/src/bin/sage-env-config.in b/src/bin/sage-env-config.in
@@ -35,3 +35,12 @@ export SAGE_PYTHON_VERSION=@SAGE_PYTHON_VERSION@
 if [ "$SAGE_PYTHON_VERSION" = 3 ]; then
     export SAGE_PYTHON3=yes
 fi
+
+export SAGE_PKG_CONFIG_PATH="@SAGE_PKG_CONFIG_PATH@"
+if [ -n "$SAGE_PKG_CONFIG_PATH" ]; then
+    # set up external pkg-config to look into SAGE_LOCAL/lib/pkgconfig/
+    # (Sage's pkgconf spkg takes care of this, if installed)
+    export PKG_CONFIG_PATH="$SAGE_PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
+fi
+
+export SAGE_NAUTY_BINS_PREFIX="@SAGE_NAUTY_BINS_PREFIX@"