From ad4a33605382fc1817e6f7cd2ee67dfc6f7ca98a Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 24 Mar 2008 22:06:46 +0000 Subject: [PATCH] Include cfg/RULES* files to get DIRECTORY_TARGET names for uninstall. --- configure/RULES_TOP | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/configure/RULES_TOP b/configure/RULES_TOP index 0eb566a40..fa5333f94 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -13,9 +13,32 @@ include $(CONFIG)/RULES_DIRS +VALID_BUILDS += Host +#--------------------------------------------------------------- +# Include installed cfg/RULES* files to get DIRECTORY_TARGETS names + +# Include RULES* files from current top +RULES_TOP:=$(INSTALL_LOCATION) +-include $(wildcard $(strip $(RULES_TOP))/cfg/RULES*) +-include $(wildcard $(CONFIG)/RULES_OCTAVE) + +RELEASE_TOPS = $(shell $(CONVERTRELEASE) -T $(TOP) -h $(EPICS_HOST_ARCH) STDOUT ) + +# Include RULES* files from tops defined in RELEASE* files +ifneq ($(RELEASE_TOPS),) +define TOP_RULES_template + RULES_TOP:=$$($(1)) + -include $$(wildcard $$(strip $($(1)))/cfg/RULES*) +endef +$(foreach top, $(RELEASE_TOPS), $(eval $(call TOP_RULES_template,$(top)) )) +endif +include $(CONFIG)/RULES_FILE_TYPE +#--------------------------------------------------------------- + UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\ $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \ $(INSTALL_DB) +UNINSTALL_DIRS += $(DIRECTORY_TARGETS) uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch)) archPart = $(word 2, $(subst $(DIVIDER), ,$@)) @@ -35,8 +58,9 @@ endif distclean: realclean realuninstall +CVSCLEAN=$(firstword $(wildcard $(TOOLS)/cvsclean.pl $(TOP)/src/tools/cvsclean.pl)) cvsclean: - @$(PERL) $(TOOLS)/cvsclean.pl + @$(PERL) $(CVSCLEAN) realuninstall: @$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)