Skip to content

Commit db666ee

Browse files
committed
Further fix
1 parent 7da5efe commit db666ee

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

build/make/Makefile.in

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,15 @@ GCC_DEP = @SAGE_GCC_DEP@
111111
OPTIONAL_INSTALLED_PACKAGES = @SAGE_OPTIONAL_INSTALLED_PACKAGES@
112112
INSTALLED_PACKAGES = $(OPTIONAL_INSTALLED_PACKAGES)
113113
INSTALLED_PACKAGE_INSTS = \
114-
$(foreach pkgname,$(INSTALLED_PACKAGES),$(inst_$(pkgname)))
114+
$(foreach pkgname,$(INSTALLED_PACKAGES),inst_$(pkgname))
115115

116116
# All previously installed standard/optional/experimental packages that are to be uninstalled
117117
OPTIONAL_UNINSTALLED_PACKAGES = @SAGE_OPTIONAL_UNINSTALLED_PACKAGES@
118118
UNINSTALLED_PACKAGES = $(OPTIONAL_UNINSTALLED_PACKAGES)
119-
UNINSTALLED_PACKAGES_UNINSTALLS = $(UNINSTALLED_PACKAGES:%=%-uninstall)
119+
UNINSTALLED_PACKAGE_UNINSTALLS = \
120+
$(foreach pkgname,$(UNINSTALLED_PACKAGES),$(pkgname)-uninstall)
121+
122+
.PHONY: $(INSTALLED_PACKAGE_INSTS) $(UNINSTALLED_PACKAGE_UNINSTALLS)
120123

121124
# All packages which should be downloaded
122125
SDIST_PACKAGES = @SAGE_SDIST_PACKAGES@
@@ -207,7 +210,7 @@ $(foreach tree,SAGE_LOCAL SAGE_VENV SAGE_DOCS, \
207210
$(eval $(tree)_UNINSTALLED_PACKAGE_UNINSTALLS = \
208211
$(foreach pkgname,$(UNINSTALLED_PACKAGES), \
209212
$(if $(findstring $(tree),$(trees_$(pkgname))), \
210-
$($(pkgname)-uninstall)))))
213+
$(pkgname)-uninstall))))
211214

212215
# ==============================================================================
213216

@@ -286,8 +289,8 @@ base-toolchain: _clean-broken-gcc base
286289

287290
# All targets except for the base packages and except the documentation
288291
all-sage: \
289-
$(SAGE_LOCAL_INSTALLED_PACKAGE_INSTS) $(SAGE_LOCAL_UNINSTALLED_PACKAGES_UNINSTALLS) \
290-
$(SAGE_VENV_INSTALLED_PACKAGE_INSTS) $(SAGE_VENV_UNINSTALLED_PACKAGES_UNINSTALLS)
292+
$(SAGE_LOCAL_INSTALLED_PACKAGE_INSTS) $(SAGE_LOCAL_UNINSTALLED_PACKAGE_UNINSTALLS) \
293+
$(SAGE_VENV_INSTALLED_PACKAGE_INSTS) $(SAGE_VENV_UNINSTALLED_PACKAGE_UNINSTALLS)
291294

292295
# Same but filtered by installation trees:
293296
all-build-local: toolchain-deps

0 commit comments

Comments
 (0)