From 4e3cceba3315487ad5d56f812e9bdec27000f9e1 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Mon, 5 Jun 2000 12:38:09 +0000
Subject: [PATCH] prevent duplicate -I for dbExpand

---
 configure/CONFIG_BASE | 2 --
 configure/RULES_BUILD | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
index 523c92d4d..ef784d53c 100644
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -40,8 +40,6 @@ INSTALL_INCLUDES += \
        -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS) \
        -I$(EPICS_BASE_INCLUDE)
 
-# add epics/base dbd directory
-INSTALL_DBDFLAGS += -I$(EPICS_BASE)/dbd
 endif
 endif
 
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 99b57f04b..85dfd15f3 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -302,8 +302,9 @@ $(INSTALL_DBD)/bpt%.dbd: ../bpt%.data
 ifdef DBDEXPAND
 $(INSTALL_DBD)/$(DBDNAME): $(addprefix ../,$(DBDEXPAND))
 	@echo Expanding dbd
+	@echo $^
 	@$(RM) $@
-	$(EPICS_BASE_HOST_BIN)/dbExpand$(HOSTEXE) $(DBDFLAGS) $^ > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand$(HOSTEXE) $(DBDFLAGS) $(addprefix ../,$(DBDEXPAND)) > $@
 endif
 
 # WIN95/NT source browser