Experimental Physics and
Industrial Control System

After updating from R3.14.12.3 or R3.14.12.7 I now find that a “make uninstall” does not remove INSTALL_LOCATION_BIN or INSTALL_LOCATION_LIB.

 

In RULES_TOP the cleandirs: target checks if those directories are empty and if so removes them, but the check seems to fail even though the directories should have just been emptied by the uninstall: target.

 

This used to work until this change was introduced in R3.14.12.5,

 

-archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))

-              @$(MAKE) -f Makefile cleandirs

+archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) | cleandirs

diff --git a/configure/RULES_TOP b/configure/RULES_TOP
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -24,25 +24,19 @@ UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
 uninstallDirs:
        $(RMDIR) $(UNINSTALL_DIRS)
 
+EMPTY_INSTALL_DIRS = \
+    $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
+    $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
 uninstall: archuninstall uninstallDirs
+       $(RMDIR) $(EMPTY_INSTALL_DIRS)
 
-archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) | cleandirs
+archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
 
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
 uninstall$(DIVIDER)%:
        $(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart)
        $(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
 
-cleandirs:
-       @$(NOP)
-ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
-       $(RMDIR) $(INSTALL_LOCATION_BIN)
-endif
-ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
-       $(RMDIR) $(INSTALL_LOCATION_LIB)
-endif
-
 
 help:
        @echo "Usage: gnumake [options] [target] ..."

-- 
Complexity comes for free, Simplicity you have to work for.