From 7eee262486a9adef9dbb26b6ab59c2145a8bf43d Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 12 Nov 2019 16:16:02 -0600 Subject: [PATCH] Shorten/simplify uninstall recipes --- configure/RULES_TOP | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configure/RULES_TOP b/configure/RULES_TOP index 4db1ace66f..1764541870 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -16,8 +16,7 @@ cvsclean: $(PERL) $(CVSCLEAN) realuninstall: uninstallDirs - $(RMDIR) $(INSTALL_LOCATION_BIN) - $(RMDIR) $(INSTALL_LOCATION_LIB) + $(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB) UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \ $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS) @@ -32,10 +31,9 @@ uninstall: archuninstall uninstallDirs archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) -archPart = $(word 2, $(subst $(DIVIDER), ,$@)) uninstall$(DIVIDER)%: - $(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart) - $(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart) + $(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \ + $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)) help: