From 6bc0cd40c070d99b27e35dd175b5794dd29b6c04 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 12 Jun 2020 17:30:00 -0700
Subject: [PATCH] Install sage-env-config with sage_conf

---
 build/pkgs/sage_conf/dependencies            | 2 +-
 build/pkgs/sage_conf/src/MANIFEST.in         | 1 +
 build/pkgs/sage_conf/src/bin/sage-env-config | 1 +
 build/pkgs/sage_conf/src/setup.cfg.in        | 3 +++
 src/setup.py                                 | 4 ++--
 5 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 build/pkgs/sage_conf/src/MANIFEST.in
 create mode 120000 build/pkgs/sage_conf/src/bin/sage-env-config

diff --git a/build/pkgs/sage_conf/dependencies b/build/pkgs/sage_conf/dependencies
index 03d9b278764..3fcf7f76b10 100644
--- a/build/pkgs/sage_conf/dependencies
+++ b/build/pkgs/sage_conf/dependencies
@@ -1 +1 @@
-$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg | $(PYTHON_TOOLCHAIN)
+$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg ../pkgs/sage_conf/src/bin/sage-env-config | $(PYTHON_TOOLCHAIN)
diff --git a/build/pkgs/sage_conf/src/MANIFEST.in b/build/pkgs/sage_conf/src/MANIFEST.in
new file mode 100644
index 00000000000..d156bc24748
--- /dev/null
+++ b/build/pkgs/sage_conf/src/MANIFEST.in
@@ -0,0 +1 @@
+include bin/sage-env-config
diff --git a/build/pkgs/sage_conf/src/bin/sage-env-config b/build/pkgs/sage_conf/src/bin/sage-env-config
new file mode 120000
index 00000000000..a3e48b05b63
--- /dev/null
+++ b/build/pkgs/sage_conf/src/bin/sage-env-config
@@ -0,0 +1 @@
+../../../../../src/bin/sage-env-config
\ No newline at end of file
diff --git a/build/pkgs/sage_conf/src/setup.cfg.in b/build/pkgs/sage_conf/src/setup.cfg.in
index d4209eda75c..3f3535b03d4 100644
--- a/build/pkgs/sage_conf/src/setup.cfg.in
+++ b/build/pkgs/sage_conf/src/setup.cfg.in
@@ -14,6 +14,9 @@ url = https://www.sagemath.org
 py_modules =
     sage_conf
 
+scripts =
+    bin/sage-env-config
+
 [options.entry_points]
 console_scripts =
     sage-config = sage_conf:_main
diff --git a/src/setup.py b/src/setup.py
index 85a32a59626..a691c78be7a 100755
--- a/src/setup.py
+++ b/src/setup.py
@@ -140,8 +140,8 @@
                  ## Uncategorized scripts in alphabetical order
                  'bin/math-readline',
                  'bin/sage-env',
-                 'bin/sage-env-config',
-                 # sage-env-config.in -- not to be installed',
+                 # sage-env-config -- installed by sage_conf
+                 # sage-env-config.in -- not to be installed
                  'bin/sage-gdb-commands',
                  'bin/sage-grep',
                  'bin/sage-grepdoc',