From d9191655737e37126c5ac41b592fb62d86119e93 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 15 Sep 2008 15:07:07 +0000 Subject: [PATCH] Moved includes for installed and RELEASE config files to CONFIG. --- configure/RULES_TOP | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/configure/RULES_TOP b/configure/RULES_TOP index 8437abdd9..97a58316d 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -13,36 +13,6 @@ 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) -ifneq ($(wildcard $(RULES_TOP)/cfg/RULES*),) --include $(wildcard $(RULES_TOP)/cfg/RULES*) -endif --include $(wildcard $(CONFIG)/RULES_OCTAVE) - - -ifneq ($(CONFIG),$(TOP)/configure) -RELEASE_TOPS = $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops ) - -# Include RULES* files from tops defined in RELEASE* files -ifneq ($(RELEASE_TOPS),) -define TOP_RULES_template - RULES_TOP:=$$($(1)) - -include $$(if $$(wildcard $$($(1))/cfg/RULES*), \ - $$(wildcard $$($(1))/cfg/RULES*),\ - nonexistantFilename) - -endef -$(foreach top, $(RELEASE_TOPS), $(eval $(call TOP_RULES_template,$(top)) )) -endif -endif -include $(CONFIG)/RULES_FILE_TYPE -#--------------------------------------------------------------- - UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\ $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \ $(INSTALL_DB)