prevent duplicate -I for dbExpand

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
 

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