From 840669563c20184e3cb62dee35866e2d92f48ff2 Mon Sep 17 00:00:00 2001
From: Janet Anderson <jba@aps.anl.gov>
Date: Thu, 11 Sep 2014 15:18:57 -0500
Subject: [PATCH] Updated concatenated database definition files

---
 configure/RULES.Db               | 9 ++++++---
 documentation/RELEASE_NOTES.html | 5 +++--
 src/tools/dbdExpand.pl           | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure/RULES.Db b/configure/RULES.Db
index 83058eb88..d14666187 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -52,9 +52,13 @@ DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
 COMMON_DBDCATS += $(addprefix $(COMMON_DIR)/,$(DBDCAT))
 DBDCAT_SOURCES += $(foreach file, $($*_DBD), $(DBDCAT_SOURCE) )
 DBDCAT_SOURCE = $(firstword $(wildcard $(file) $(foreach dir,  \
-    $(GENERIC_SRC_DIRS),$(addsuffix /$(file),$(dir)))) \
+    $(DBD_SEARCH_DIRS),$(addsuffix /$(file),$(dir)))) \
     $(COMMON_DIR)/$(file))
 
+DBDCAT_COMMAND = $(if $(DBDCAT_SOURCES),\
+    $(CAT) $(DBDCAT_SOURCES) > $(notdir $@),\
+    @echo "No input files for $(notdir $@)")
+
 INSTALL_DBDS += $(addprefix $(INSTALL_DBD)/,$(DBDCAT))
 
 # ---------------------------------------------------
@@ -388,8 +392,7 @@ $(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name)))
 $(COMMON_DBDCATS):$(COMMON_DIR)/%.dbd:
 	$(ECHO) "Creating dbd file $(notdir $@)"
 	@$(RM) $(notdir $@)
-	$(CAT) $(DBDCAT_SOURCES) > $(notdir $@)
-	#@$(CAT) $^ > $(notdir $@)
+	$(DBDCAT_COMMAND)
 	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%.dbd:
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 84c2b4be7..4d6a6ceeb 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -30,8 +30,9 @@ expansions will be done.
 </pre></blockquote>
 
 The files file1.dbd, file2.dbd, and file3.dbd will be found if they exist in the 
-current directory, are created by the current Makefile, have fullpath name ,or 
-exist in a directory of the currently defined SRC_DIRS list.</p>
+current directory, are created by the current Makefile, have fullpath name , exist
+in a directory of the currently defined SRC_DIRS list, exist in the install dbd 
+directory, or exist in a dbd directory of a current release module..</p>
 
 <h3>On POSIX, attempt to lock all memory when running with FIFO scheduler</h3>
 
diff --git a/src/tools/dbdExpand.pl b/src/tools/dbdExpand.pl
index 0f117bf70..64c4423bd 100755
--- a/src/tools/dbdExpand.pl
+++ b/src/tools/dbdExpand.pl
@@ -34,7 +34,7 @@ if ($opt_D) {
     $dep = "\$(COMMON_DIR)/$dep";
 }
 
-exit 0 if (!@ARGV);
+die "No input files for $opt_o" if (!@ARGV);
 
 while (@ARGV) {
     my $file = shift @ARGV;