diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE index 2cc909231..dd559536d 100644 --- a/configure/CONFIG_BASE +++ b/configure/CONFIG_BASE @@ -63,7 +63,7 @@ DBEXPAND = $(call PATH_FILTER, $(TOOLS)/dbExpand$(HOSTEXE)) DBTORECORDTYPEH = $(call PATH_FILTER, $(TOOLS)/dbToRecordtypeH$(HOSTEXE)) DBTOMENUH = $(call PATH_FILTER, $(TOOLS)/dbToMenuH$(HOSTEXE)) REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl -CONVERTRELEASE=$(PERL) $(firstword $(wildcard $(TOOLS)/convertRelease.pl $(TOP)/src/tools/convertRelease.pl)) +CONVERTRELEASE=$(PERL) $(TOOLS)/convertRelease.pl #------------------------------------------------------- # tools for installing libraries and products diff --git a/configure/RULES_TOP b/configure/RULES_TOP index db036c59a..8437abdd9 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -24,6 +24,8 @@ ifneq ($(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 @@ -37,6 +39,7 @@ define TOP_RULES_template endef $(foreach top, $(RELEASE_TOPS), $(eval $(call TOP_RULES_template,$(top)) )) endif +endif include $(CONFIG)/RULES_FILE_TYPE #---------------------------------------------------------------