From 2ab9b09b39a4b5f8e73e88aba24aad78c2ff31d5 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 26 Feb 2020 19:36:51 -0800
Subject: [PATCH] Move SAGE_PKG_CONFIG_PATH, SAGE_NAUTY_BINS_PREFIX back to
 src/bin/sage-env-config.in

---
 build/bin/sage-build-env-config.in | 9 ---------
 src/bin/sage-env-config.in         | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/bin/sage-build-env-config.in b/build/bin/sage-build-env-config.in
index de4de3183e1..e7c6d386f53 100644
--- 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
index 22f051e2b21..d9434e027a8 100644
--- 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@"