From 22db10da16d95b18da7f8187920ef60f0e8c6536 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 22 Sep 2014 16:09:46 -0500
Subject: [PATCH] std: Reintroduce manually-created base.dbd file

The auto-generated base.dbd file has all the includes fully
expaded out before installation, which prevents IOC applications
from being able to replace manuScan.dbd and menuconvert.dbd
---
 src/std/softIoc/Makefile |  8 --------
 src/std/softIoc/RULES    |  6 ++----
 src/std/softIoc/base.dbd | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 src/std/softIoc/base.dbd

diff --git a/src/std/softIoc/Makefile b/src/std/softIoc/Makefile
index 13f883155..74a505b74 100644
--- a/src/std/softIoc/Makefile
+++ b/src/std/softIoc/Makefile
@@ -15,14 +15,6 @@ PROD_IOC_iOS = -nil-
 DBD += base.dbd
 DBD += softIoc.dbd
 
-base_DBD += menuGlobal.dbd
-base_DBD += menuConvert.dbd
-base_DBD += stdRecords.dbd
-base_DBD += filters.dbd
-base_DBD += devSoft.dbd
-base_DBD += asSub.dbd
-base_DBD += dbCore.dbd
-
 softIoc_DBD += base.dbd
 softIoc_DBD += dlload.dbd
 softIoc_DBD += system.dbd
diff --git a/src/std/softIoc/RULES b/src/std/softIoc/RULES
index 393afc36d..3cf877a28 100644
--- a/src/std/softIoc/RULES
+++ b/src/std/softIoc/RULES
@@ -7,10 +7,8 @@
 
 # This is a Makefile fragment, see src/ioc/Makefile.
 
-base.dbd$(DEP): $(COMMON_DIR)/stdRecords.dbd
-softIoc.dbd$(DEP): $(COMMON_DIR)/base.dbd
-$(COMMON_DIR)/base.dbd: $(COMMON_DIR)/stdRecords.dbd
-$(COMMON_DIR)/softIoc.dbd: $(COMMON_DIR)/base.dbd
+softIoc.dbd$(DEP): $(COMMON_DIR)/stdRecords.dbd
+$(COMMON_DIR)/softIoc.dbd: $(STDDIR)/softIoc/Makefile
 
 softMain$(DEP): epicsInstallDir.h
 
diff --git a/src/std/softIoc/base.dbd b/src/std/softIoc/base.dbd
new file mode 100644
index 000000000..afa852c05
--- /dev/null
+++ b/src/std/softIoc/base.dbd
@@ -0,0 +1,24 @@
+# $Revision-Id$
+#
+# This file defines the standard record types and device support
+# provided by Base and (usually) loaded into all IOCs.
+
+# Menus
+include "menuGlobal.dbd"
+include "menuConvert.dbd"
+
+# Record types
+include "stdRecords.dbd"
+
+# Channel filters & plugins
+include "filters.dbd"
+
+# "Soft Channel", "Raw Soft Channel", and "Async Soft Channel" device support
+include "devSoft.dbd"
+
+# Access security subroutines
+include "asSub.dbd"
+
+# IOC Core variables
+include "dbCore.dbd"
+