From addfff51fa70b18e327ef955978e13301ae5da2b Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 27 Aug 1999 21:52:40 +0000 Subject: [PATCH] Changes to remove bin and lib dirs. --- config/RULES_TOP | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/config/RULES_TOP b/config/RULES_TOP index 8ba72c4ff..8766badae 100644 --- a/config/RULES_TOP +++ b/config/RULES_TOP @@ -4,12 +4,8 @@ include $(TOP)/config/RULES_DIRS -$(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)):: - @$(RMDIR) rec.bak rec - @$(RMDIR) $(INSTALL_LOCATION_BIN)/$* $(INSTALL_LOCATION_LIB)/$* \ - $(INSTALL_DBD) $(INSTALL_MAN) $(INSTALL_INCLUDE) $(INSTALL_DOC)\ - $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) - @$(MAKE) -f Makefile cleandirs +uninstall$(DIVIDER)%:: + @$(RMDIR) $(INSTALL_LOCATION_BIN)/$* $(INSTALL_LOCATION_LIB)/$* cleandirs: ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),) @@ -19,8 +15,11 @@ ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),) @$(RMDIR) $(INSTALL_LOCATION_LIB) endif - uninstall:: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) + @$(MAKE) -f Makefile cleandirs + @$(RMDIR) rec.bak rec + @$(RMDIR) $(INSTALL_DBD) $(INSTALL_MAN) $(INSTALL_INCLUDE) $(INSTALL_DOC)\ + $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) tar: @DIRNAME=$(notdir $(shell pwd)); \ @@ -57,7 +56,6 @@ help: @echo " xxxRecord.o" .PHONY :: uninstall tar help cleandirs -.PHONY :: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))