From 3f290c6c9eecfbdb3070c12d8b82ae893584fa25 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Fri, 9 Apr 2004 14:11:17 +0000
Subject: [PATCH] Use perl tools from config/tools directory instead of bin
 directory.

---
 config/CONFIG_COMMON            |  3 ++-
 config/CONFIG_HOST_ARCH.Borland | 12 ++++++------
 config/CONFIG_HOST_ARCH.WIN32   | 10 +++++-----
 config/RULES.Vx                 |  4 ++--
 config/RULES_ARCHS              |  8 ++++----
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON
index 2b9e9080e..36549ec42 100644
--- a/config/CONFIG_COMMON
+++ b/config/CONFIG_COMMON
@@ -42,6 +42,7 @@ INSTALL_CONFIG              = $(INSTALL_LOCATION)/config
 INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib
 
 EPICS_BASE_INCLUDE      = $(EPICS_BASE)/include
+EPICS_BASE_TOOLS        = $(EPICS_BASE)/config/tools
 
 DIVIDER = .
 OBJ = .
@@ -63,7 +64,7 @@ LEX   = $(ELEX)
 PERL=perl
 
 # install from EPICS
-INSTALL = $(PERL) $(EPICS_BASE_HOST_BIN)/installEpics.pl
+INSTALL = $(PERL) $(EPICS_BASE_TOOLS)/installEpics.pl
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
diff --git a/config/CONFIG_HOST_ARCH.Borland b/config/CONFIG_HOST_ARCH.Borland
index 721375226..c8e26ce48 100644
--- a/config/CONFIG_HOST_ARCH.Borland
+++ b/config/CONFIG_HOST_ARCH.Borland
@@ -13,12 +13,12 @@
 EXE=.exe
 HOSTEXE=.exe
 
-CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
-MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
-RM   =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
-MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
-RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
-FN   =$(PERL) $(EPICS_BASE_HOST_BIN)/fullName.pl
+CP   =$(PERL) $(EPICS_BASE_TOOLS)/cp.pl
+MV   =$(PERL) $(EPICS_BASE_TOOLS)/mv.pl
+RM   =$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -f
+MKDIR=$(PERL) $(EPICS_BASE_TOOLS)/mkdir.pl
+RMDIR=$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -rf
+FN   =$(PERL) $(EPICS_BASE_TOOLS)/fullName.pl
 CHMOD=echo
 ECHO=echo
 
diff --git a/config/CONFIG_HOST_ARCH.WIN32 b/config/CONFIG_HOST_ARCH.WIN32
index 1e87a12ae..31c539e46 100644
--- a/config/CONFIG_HOST_ARCH.WIN32
+++ b/config/CONFIG_HOST_ARCH.WIN32
@@ -13,11 +13,11 @@
 EXE=.exe
 HOSTEXE=.exe
 
-CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
-MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
-RM   =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
-MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
-RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
+CP   =$(PERL) $(EPICS_BASE_TOOLS)/cp.pl
+MV   =$(PERL) $(EPICS_BASE_TOOLS)/mv.pl
+RM   =$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -f
+MKDIR=$(PERL) $(EPICS_BASE_TOOLS)/mkdir.pl
+RMDIR=$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -rf
 CHMOD=echo
 ECHO=echo
 
diff --git a/config/RULES.Vx b/config/RULES.Vx
index 93bc4d06d..0d588349a 100644
--- a/config/RULES.Vx
+++ b/config/RULES.Vx
@@ -129,7 +129,7 @@ endif
 %.out : %.o
 	@ $(RM) ctct.o ctdt.c nm.out
 	$(NM) $<  > nm.out
-	$(PERL) $(EPICS_BASE)/bin/$(HOST_ARCH)/munch.pl < nm.out > ctdt.c
+	$(PERL) $(EPICS_BASE_TOOLS)/munch.pl < nm.out > ctdt.c
 	$(COMPILE.c) -traditional ctdt.c
 	$(LINK.cc) $@ $< ctdt.o
 
@@ -137,7 +137,7 @@ endif
 $(MUNCHNAME):%.munch : %
 	@ $(RM) ctct.o ctdt.c nm.out
 	$(NM) $<  > nm.out
-	$(PERL) $(EPICS_BASE)/bin/$(HOST_ARCH)/munch.pl < nm.out > ctdt.c
+	$(PERL) $(EPICS_BASE_TOOLS)/munch.pl < nm.out > ctdt.c
 	$(COMPILE.c) -traditional ctdt.c
 	$(LINK.cc) $@ $(LDFLAGS) $< ctdt.o
 
diff --git a/config/RULES_ARCHS b/config/RULES_ARCHS
index 57ed706ad..bc5f1947d 100644
--- a/config/RULES_ARCHS
+++ b/config/RULES_ARCHS
@@ -60,11 +60,11 @@ $(crossActionArchTargets) :
 $(crossArchs) : 
 endif
 
-$(hostDirs) : 
-	$(PERL) $(EPICS_BASE_HOST_BIN)/makeMakefile.pl $@ Host
+$(hostDirs) : $(EPICS_BASE_TOOLS)/makeMakefile.pl
+	$(PERL) $(EPICS_BASE_TOOLS)/makeMakefile.pl $@ Host
 
-$(crossDirs) : 
-	$(PERL) $(EPICS_BASE_HOST_BIN)/makeMakefile.pl $@ Vx
+$(crossDirs) : $(EPICS_BASE_TOOLS)/makeMakefile.pl
+	$(PERL) $(EPICS_BASE_TOOLS)/makeMakefile.pl $@ Vx
 
 #
 # host/cross action targets