From 92e7023880b8a5aa30a262560881526a653bb52d Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Mon, 1 Jun 1998 19:42:30 +0000
Subject: [PATCH] Still working toward beta12

---
 src/makeBaseApp/top/config/CONFIG_APP                     | 1 +
 src/makeBaseApp/top/config/RULES.ioc                      | 8 ++++----
 .../top/config/{makeIoccdcmds.pl => makeIocCdCommands.pl} | 6 +++---
 src/makeBaseApp/top/exampleApp/src/Makefile.Host          | 5 +++++
 src/makeBaseApp/top/exampleApp/src/Makefile.Vx            | 4 ----
 src/makeBaseApp/top/exampleBoot/ioc/st.cmd                | 2 +-
 src/makeBaseApp/top/simpleBoot/ioc/st.cmd                 | 2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)
 rename src/makeBaseApp/top/config/{makeIoccdcmds.pl => makeIocCdCommands.pl} (82%)

diff --git a/src/makeBaseApp/top/config/CONFIG_APP b/src/makeBaseApp/top/config/CONFIG_APP
index adeeb8e79..75ffab5bb 100644
--- a/src/makeBaseApp/top/config/CONFIG_APP
+++ b/src/makeBaseApp/top/config/CONFIG_APP
@@ -17,6 +17,7 @@ USR_INCLUDES += -I$(SHARE)/include
 SHARE_BIN = $(SHARE)/bin/$(T_A)
 endif
 
+#Following only works if host provides soft links
 ifdef MASTER_IOCAPPS
 USR_INCLUDES += -I$(MASTER_IOCAPPS)/include
 MASTER_IOCAPPS_BIN = $(MASTER_IOCAPPS)/bin/$(T_A)
diff --git a/src/makeBaseApp/top/config/RULES.ioc b/src/makeBaseApp/top/config/RULES.ioc
index af7295d14..c8a3c0a8a 100644
--- a/src/makeBaseApp/top/config/RULES.ioc
+++ b/src/makeBaseApp/top/config/RULES.ioc
@@ -1,9 +1,9 @@
 #RULES.ioc
 include $(EPICS_BASE)/config/RULES_DIRS
-buildInstall:: cdcmds
+buildInstall:: cdCommands
 
-cdcmds: Makefile
-	$(PERL) $(TOP)/config/makeIoccdcmds.pl $(ARCH)
+cdCommands: Makefile
+	$(PERL) $(TOP)/config/makeIocCdCommands.pl $(ARCH)
 
 clean::
-	@$(RM) cdcmds
+	@$(RM) cdCommands
diff --git a/src/makeBaseApp/top/config/makeIoccdcmds.pl b/src/makeBaseApp/top/config/makeIocCdCommands.pl
similarity index 82%
rename from src/makeBaseApp/top/config/makeIoccdcmds.pl
rename to src/makeBaseApp/top/config/makeIocCdCommands.pl
index 0ff7d9dab..c8d74dd92 100644
--- a/src/makeBaseApp/top/config/makeIoccdcmds.pl
+++ b/src/makeBaseApp/top/config/makeIocCdCommands.pl
@@ -1,5 +1,5 @@
 eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
-    if $running_under_some_shell; # makeIoccdcmds.pl
+    if $running_under_some_shell; # makeIocCdCommands.pl
 
 use Cwd;
 
@@ -8,8 +8,8 @@ $cwd  = cwd();
 $cwd =~ s|/tmp_mnt||;
 $arch = $ARGV[0];
 
-unlink("cdcmds");
-open(OUT,">cdcmds") or die "$! opening cdcmds";
+unlink("cdCommands");
+open(OUT,">cdCommands") or die "$! opening cdCommands";
 print OUT "startup = \"$cwd\"\n";
 $appbin = $cwd;
 $appbin =~ s/iocBoot.*//;
diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile.Host b/src/makeBaseApp/top/exampleApp/src/Makefile.Host
index ef5290b7e..b0d8a23b5 100644
--- a/src/makeBaseApp/top/exampleApp/src/Makefile.Host
+++ b/src/makeBaseApp/top/exampleApp/src/Makefile.Host
@@ -4,6 +4,11 @@ include $(TOP)/config/CONFIG_APP
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 
+USER_DBDFLAGS += -I .. -I $(EPICS_BASE)/dbd
+RECTYPES += xxxRecord.h
+DBDEXPAND = exampleInclude.dbd
+DBDNAME = exampleApp.dbd
+
 #USR_CFLAGS += 
 PROD_LIBS	+= ca
 PROD_LIBS	+= Db
diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile.Vx b/src/makeBaseApp/top/exampleApp/src/Makefile.Vx
index 4d2a2d21c..fac602c8a 100644
--- a/src/makeBaseApp/top/exampleApp/src/Makefile.Vx
+++ b/src/makeBaseApp/top/exampleApp/src/Makefile.Vx
@@ -4,10 +4,6 @@ include $(TOP)/config/CONFIG_APP
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 
-USER_DBDFLAGS += -I .. -I $(EPICS_BASE)/dbd
-RECTYPES += xxxRecord.h
-DBDEXPAND = exampleInclude.dbd
-DBDNAME = exampleApp.dbd
 SRCS.c += ../xxxRecord.c
 SRCS.c += ../devXxxSoft.c
 
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
index f17ef288c..a89bfc733 100644
--- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
+++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
@@ -3,7 +3,7 @@
 # Following must be added for many board support packages
 #cd <full path to target bin directory>
 
-< cdcmds
+< cdCommands
 
 #< nfsCommands
 
diff --git a/src/makeBaseApp/top/simpleBoot/ioc/st.cmd b/src/makeBaseApp/top/simpleBoot/ioc/st.cmd
index f07f2c03c..24f4c5c7f 100644
--- a/src/makeBaseApp/top/simpleBoot/ioc/st.cmd
+++ b/src/makeBaseApp/top/simpleBoot/ioc/st.cmd
@@ -2,7 +2,7 @@
 #Following must be added for many board support packages
 #cd <full path to target bin directory>
 
-< cdcmds
+< cdCommands
  
 #< nfsCommands