From be7c6a0a0a49605181eafb5ebc2c95402861956c Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 28 Oct 2020 23:26:25 -0500 Subject: [PATCH] Build: Do clean before uninstall actions (if requested) --- configure/RULES_TOP | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/RULES_TOP b/configure/RULES_TOP index b956839ec..9cac51c68 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -33,7 +33,7 @@ UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS) ifneq ($(INSTALL_LOCATION),$(TOP)) UNINSTALL_DIRS += $(INSTALL_CONFIG) endif -uninstallDirs: +uninstallDirs: | clean $(RMDIR) $(UNINSTALL_DIRS) # Remove the bin and lib directories if they have no sub-directories @@ -41,12 +41,12 @@ uninstallDirs: EMPTY_INSTALL_DIRS = \ $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \ $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB)) -uninstall: archuninstall uninstallDirs +uninstall: archuninstall uninstallDirs | clean $(RMDIR) $(EMPTY_INSTALL_DIRS) archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) -uninstall$(DIVIDER)%: +uninstall$(DIVIDER)%: | clean $(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \ $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB))