Merge #32442

.gitignore

@@ -190,6 +190,7 @@ src/*.egg-info/
 /src/bin/sage-src-env-config
 
 # Virtual environments
+/venv
 src/.env
 src/.venv
 src/env/

Makefile

@@ -120,6 +120,7 @@ distclean: build-clean
 	@echo "Deleting all remaining output from build system ..."
 	rm -rf local
 	rm -f src/bin/sage-env-config
+	rm -f prefix venv
 
 # Delete all auto-generated files which are distributed as part of the
 # source tarball

configure.ac

@@ -84,7 +84,7 @@ SAGE_SRC="$SAGE_ROOT/src"
 SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
 
 AC_ARG_WITH([sage-venv],
-            [AS_HELP_STRING([--with-sage-venv={auto,yes,no,SAGE_VENV}],
+            [AS_HELP_STRING([--with-sage-venv={auto (default),yes,no,SAGE_VENV}],
                             [put Python packages into an installation hierarchy separate from prefix])],
             [SAGE_VENV="$withval"],
             [SAGE_VENV="auto"])
@@ -521,13 +521,15 @@ AC_CONFIG_COMMANDS(links, [
     SYMLINK="${ac_top_build_prefix}prefix"
     AS_IF([test -L "$SYMLINK" -o ! -e "$SYMLINK"], [
         AC_MSG_NOTICE([creating convenience symlink $SYMLINK -> $SAGE_LOCAL])
+        rm -f "$SYMLINK"
         ln -sf "$SAGE_LOCAL" "$SYMLINK"
     ], [
         AC_MSG_NOTICE([cannot create convenience symlink $SYMLINK -> $SAGE_LOCAL because the file exists and is not a symlink; this is harmless])
     ])
     SYMLINK="${ac_top_build_prefix}venv"
     AS_IF([test -L "$SYMLINK" -o ! -e "$SYMLINK"], [
         AC_MSG_NOTICE([creating convenience symlink $SYMLINK -> $SAGE_VENV])
+        rm -f "$SYMLINK"
         ln -sf "$SAGE_VENV" "$SYMLINK"
     ], [
         AC_MSG_NOTICE([cannot create convenience symlink $SYMLINK -> $SAGE_VENV because the file exists and is not a symlink; this is harmless])