From 83618673bccebc85bb0cc49a242da7e3fc070ec9 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Fri, 10 Jul 2009 21:51:25 +0000
Subject: [PATCH] Executed host tools should be from EPICS_BASE_HOST_BIN
 directory.

---
 src/bpt/Makefile | 4 +++-
 src/gdd/Makefile | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/bpt/Makefile b/src/bpt/Makefile
index 389ca73a7..0ec2b98c3 100644
--- a/src/bpt/Makefile
+++ b/src/bpt/Makefile
@@ -26,5 +26,7 @@ makeBpt_SRCS=makeBpt
 
 include $(TOP)/configure/RULES
 
-$(COMMON_DBDS): $(INSTALL_PROD)
+#$(COMMON_DBDS): $(INSTALL_PROD)
+
+$(COMMON_DBDS): $(MAKEBPT)
 
diff --git a/src/gdd/Makefile b/src/gdd/Makefile
index ca9043892..e6c58c1d2 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -84,11 +84,11 @@ dbMapper$(OBJ):	$(COMMON_DIR)/gddApps.h
 
 # Rules for generated files
 
-$(COMMON_DIR)/aitConvertGenerated.cc: $(INSTALL_HOST_BIN)/aitGen$(HOSTEXE)
-	$(INSTALL_HOST_BIN)/aitGen$(HOSTEXE) $@
+$(COMMON_DIR)/aitConvertGenerated.cc: $(TOOLS)/aitGen$(HOSTEXE)
+	$(TOOLS)/aitGen$(HOSTEXE) $@
 
-$(COMMON_DIR)/gddApps.h : $(INSTALL_HOST_BIN)/genApps$(HOSTEXE)
-	$(INSTALL_HOST_BIN)/genApps$(HOSTEXE) $@
+$(COMMON_DIR)/gddApps.h : $(TOOLS)/genApps$(HOSTEXE)
+	$(TOOLS)/genApps$(HOSTEXE) $@
 
 clean::
 	@$(RM) $(COMMON_DIR)/aitConvertGenerated.cc