From 84e74d09241b0e49dc7e557e389869982121060f Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 9 Mar 2015 11:33:50 -0500 Subject: [PATCH] Fix 'Can't find convertRelease.pl' problem --- configure/CONFIG_BASE | 3 ++- configure/RULES_TOP | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE index d1f561503..c6cdaac6e 100644 --- a/configure/CONFIG_BASE +++ b/configure/CONFIG_BASE @@ -54,6 +54,7 @@ BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK)) # Where to find the installed build tools TOOLS = $(EPICS_BASE_HOST_BIN) +FIND_TOOL = $(firstword $(wildcard $$(TOOLS)/$(1) $(TOP)/src/tools/$(1))) #--------------------------------------------------------------- # Epics base build tools and tool flags @@ -63,7 +64,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) $(TOOLS)/convertRelease.pl +CONVERTRELEASE = $(PERL) $(call FIND_TOOL,convertRelease.pl) FULLPATHNAME = $(PERL) $(TOOLS)/fullPathName.pl #------------------------------------------------------- diff --git a/configure/RULES_TOP b/configure/RULES_TOP index d05188943..1898f591e 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -14,8 +14,7 @@ include $(CONFIG)/RULES_DIRS distclean: realclean cvsclean realuninstall -CVSCLEAN = $(firstword \ - $(wildcard $(TOOLS)/cvsclean.pl $(TOP)/src/tools/cvsclean.pl)) +CVSCLEAN = $(call FIND_TOOL,cvsclean.pl) cvsclean: $(PERL) $(CVSCLEAN)