diff --git a/configure/CONFIG b/configure/CONFIG
index 331fd7024..a5fc1151c 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -19,6 +19,10 @@ include $(CONFIG)/CONFIG
 # Override the Base definition:
 INSTALL_LOCATION = $(TOP)
 
+# Local tools
+AITGEN = $(INSTALL_BIN)/aitGen$(HOSTEXE)
+GENAPPS = $(INSTALL_BIN)/genApps$(HOSTEXE)
+
 # CONFIG_SITE files contain other build configuration settings
 include $(TOP)/configure/CONFIG_SITE
 -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
diff --git a/src/gdd/Makefile b/src/gdd/Makefile
index ec6988b46..0c8fde26d 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 
 TOP=../..
@@ -84,9 +84,8 @@ dbMapper$(DEP): $(COMMON_DIR)/gddApps.h
 
 # Rules for generated files
 #
-$(COMMON_DIR)/aitConvertGenerated.cc: $(EPICS_BASE_HOST_BIN)/aitGen$(HOSTEXE)
-	$(TOOLS)/aitGen$(HOSTEXE) $@
-
-$(COMMON_DIR)/gddApps.h : $(EPICS_BASE_HOST_BIN)/genApps$(HOSTEXE)
-	$(TOOLS)/genApps$(HOSTEXE) $@
+$(COMMON_DIR)/aitConvertGenerated.cc: $(AITGEN)
+	$(AITGEN) $@
 
+$(COMMON_DIR)/gddApps.h : $(GENAPPS)
+	$(GENAPPS) $@