Rename SAGE_OPTIONAL_CLEANED_PACKAGES to SAGE_OPTIONAL_UNINSTALLED_PACKAGES

Author: Matthias Koeppe

build/make/Makefile.in

@@ -105,9 +105,9 @@ INSTALLED_PACKAGE_INSTS = \
     $(foreach pkgname,$(INSTALLED_PACKAGES),$(inst_$(pkgname)))
 
 # All previously installed standard/optional/experimental packages that are to be uninstalled
-OPTIONAL_CLEANED_PACKAGES = @SAGE_OPTIONAL_CLEANED_PACKAGES@
-CLEANED_PACKAGES = $(OPTIONAL_CLEANED_PACKAGES)
-CLEANED_PACKAGES_CLEANS = $(CLEANED_PACKAGES:%=%-clean)
+OPTIONAL_UNINSTALLED_PACKAGES = @SAGE_OPTIONAL_UNINSTALLED_PACKAGES@
+UNINSTALLED_PACKAGES = $(OPTIONAL_UNINSTALLED_PACKAGES)
+UNINSTALLED_PACKAGES_CLEANS = $(UNINSTALLED_PACKAGES:%=%-clean)
 
 # All packages which should be downloaded
 SDIST_PACKAGES = @SAGE_SDIST_PACKAGES@
@@ -233,18 +233,18 @@ base-toolchain: _clean-broken-gcc base
 all-sage: \
 		sagelib \
 		$(INSTALLED_PACKAGE_INSTS) \
-                $(CLEANED_PACKAGES_CLEANS)
+                $(UNINSTALLED_PACKAGES_CLEANS)
 
 # Same but filtered by installation trees:
 all-build-local: toolchain-deps
 	+$(MAKE_REC) all-sage-local
 
-all-sage-local: $(SAGE_LOCAL_INSTALLED_PACKAGE_INSTS) $(SAGE_LOCAL_CLEANED_PACKAGES_CLEANS)
+all-sage-local: $(SAGE_LOCAL_INSTALLED_PACKAGE_INSTS) $(SAGE_LOCAL_UNINSTALLED_PACKAGES_CLEANS)
 
 all-build-venv: toolchain-deps
 	+$(MAKE_REC) all-sage-venv
 
-all-sage-venv:  $(SAGE_VENV_INSTALLED_PACKAGE_INSTS)  $(SAGE_VENV_CLEANED_PACKAGES_CLEANS)
+all-sage-venv:  $(SAGE_VENV_INSTALLED_PACKAGE_INSTS)  $(SAGE_VENV_UNINSTALLED_PACKAGES_CLEANS)
 
 # Download all packages which should be inside an sdist tarball (the -B
 # option to make forces all targets to be built unconditionally)

m4/sage_spkg_collect.m4

@@ -23,7 +23,7 @@
 #      - SAGE_OPTIONAL_INSTALLED_PACKAGES - lists the names of packages with the
 #        "standard", "optional", or "experimental" type that should be installed.
 #
-#      - SAGE_OPTIONAL_CLEANED_PACKAGES - lists the names of packages with the
+#      - SAGE_OPTIONAL_UNINSTALLED_PACKAGES - lists the names of packages with the
 #        "standard", "optional", or "experimental" type that should be uninstalled.
 #
 #      - SAGE_SDIST_PACKAGES - lists the names of all packages whose sources
@@ -108,7 +108,7 @@ SAGE_DUMMY_PACKAGES=''
 # List of currently installed and to-be-installed standard/optional/experimental packages
 SAGE_OPTIONAL_INSTALLED_PACKAGES=''
 # List of optional packages to be uninstalled
-SAGE_OPTIONAL_CLEANED_PACKAGES=''
+SAGE_OPTIONAL_UNINSTALLED_PACKAGES=''
 
 # List of all packages that should be downloaded
 SAGE_SDIST_PACKAGES=''
@@ -307,7 +307,7 @@ for DIR in $SAGE_ROOT/build/pkgs/*; do
     spkg_line=" \\$(printf '\n    ')$SPKG_NAME"
     AS_CASE([$is_installed-$want_spkg],
             [*-yes],  [AS_VAR_APPEND(SAGE_OPTIONAL_INSTALLED_PACKAGES, "$spkg_line")],
-            [yes-no], [AS_VAR_APPEND(SAGE_OPTIONAL_CLEANED_PACKAGES, "$spkg_line")])
+            [yes-no], [AS_VAR_APPEND(SAGE_OPTIONAL_UNINSTALLED_PACKAGES, "$spkg_line")])
 
     # Determine package dependencies
     #
@@ -354,7 +354,7 @@ AC_SUBST([SAGE_SCRIPT_PACKAGES])
 AC_SUBST([SAGE_BUILT_PACKAGES])
 AC_SUBST([SAGE_DUMMY_PACKAGES])
 AC_SUBST([SAGE_OPTIONAL_INSTALLED_PACKAGES])
-AC_SUBST([SAGE_OPTIONAL_CLEANED_PACKAGES])
+AC_SUBST([SAGE_OPTIONAL_UNINSTALLED_PACKAGES])
 AC_SUBST([SAGE_SDIST_PACKAGES])
 ])