From 68556e053402c2c03e870f05864c27d2714c8d99 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 7 Apr 2004 18:33:37 +0000
Subject: [PATCH] COMMON_DIR changes.

---
 configure/RULES.Db | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure/RULES.Db b/configure/RULES.Db
index 45b8c574f..633115729 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -12,8 +12,8 @@
 #####################################################  vpath
 
 vpath %.dbd $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DBD))
-vpath %.db $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB)) $(COMMON_DIR)
-vpath %.vdb $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB)) $(COMMON_DIR)
+vpath %.db $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB))
+vpath %.vdb $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB))
 vpath %.substitutions $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 vpath %.template $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 vpath bpt%.data $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
@@ -192,10 +192,18 @@ $(INSTALL_DB)/%.template: %.template
 
 ##################################################### INC files
 
+$(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
+	@$(RM) $@
+	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@
+
 $(COMMON_DIR)/%Record.h: %Record.dbd
 	@$(RM) $@
 	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@
 
+$(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
+	@$(RM) $@
+	$(DBTOMENUH) $< $@
+
 $(COMMON_DIR)/menu%.h: menu%.dbd
 	@$(RM) $@
 	$(DBTOMENUH) $< $@
@@ -236,7 +244,7 @@ dbdInstalls:  $(DBD_INSTALLS)
 	@echo "Installing $(^F)"
 	@$(INSTALL) -d -m 555 $^ $(INSTALL_DBD)
 
-.PRECIOUS: $(COMMON_DBDS)
+.PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%Include.dbd
 
 ##################################################### DB files