From 171e63d7facf9676b817d04243d23c0ce707c0de Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@bessy.de>
Date: Tue, 23 Nov 1999 16:59:24 +0000
Subject: [PATCH] += USER/USR_DBDFLAGS upward compatibility

---
 config/RULES.Host                   |  5 +++++
 config/RULES.Unix                   | 11 +++++++++++
 config/RULES.Vx                     |  5 +++++
 src/makeBaseApp/top/config/RULES.Db |  5 +++++
 4 files changed, 26 insertions(+)

diff --git a/config/RULES.Host b/config/RULES.Host
index bcbdb0247..fd9c29c54 100644
--- a/config/RULES.Host
+++ b/config/RULES.Host
@@ -632,6 +632,11 @@ bpt%.dbd: ../bpt%.data
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(EXE) $<
  
+# Patch for old applications
+ifdef USER_DBDFLAGS
+DBDFLAGS = $(USER_DBDFLAGS)
+endif
+
 ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo Expanding dbd
diff --git a/config/RULES.Unix b/config/RULES.Unix
index 57531e542..8bdcad536 100644
--- a/config/RULES.Unix
+++ b/config/RULES.Unix
@@ -203,11 +203,22 @@ bpt%.dbd: ../bpt%.data
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt $<
  
+# Patch for old applications
+ifdef USER_DBDFLAGS
+DBDFLAGS = $(USER_DBDFLAGS)
+endif
+
+ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo expanding dbd
 	@$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand $(DBDFLAGS) $< > $@
 
+ifneq (,$(wildcard ../base.dbd))
+$(DBDNAME): ../base.dbd
+endif
+endif
+
 $(LIBNAME): $(LIBOBJS)
 	@echo Building library $@
 	$(RM) $@
diff --git a/config/RULES.Vx b/config/RULES.Vx
index 24cd3ba81..4132b1177 100644
--- a/config/RULES.Vx
+++ b/config/RULES.Vx
@@ -214,6 +214,11 @@ bpt%.dbd: ../bpt%.data
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(EXE) $<
 
+# Patch for old applications
+ifdef USER_DBDFLAGS
+DBDFLAGS = $(USER_DBDFLAGS)
+endif
+
 ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo Expanding dbd
diff --git a/src/makeBaseApp/top/config/RULES.Db b/src/makeBaseApp/top/config/RULES.Db
index 5b3928a69..37e853c2f 100644
--- a/src/makeBaseApp/top/config/RULES.Db
+++ b/src/makeBaseApp/top/config/RULES.Db
@@ -180,6 +180,11 @@ bpt%.dbd:: ../bpt%.data
 	$(RM) $@
 	$(MAKEBPT) $<
 
+# Patch for old applications
+ifdef USER_DBDFLAGS
+DBDFLAGS = $(USER_DBDFLAGS)
+endif
+
 ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo "Expanding dbd"