From fd0daa0b92bf9786a3957af3e250f22191a3e272 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Fri, 17 Jan 1997 19:48:27 +0000
Subject: [PATCH] various bugs

---
 src/tools/makeBaseApp | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/tools/makeBaseApp b/src/tools/makeBaseApp
index ff93ceaea..bc7f6195a 100755
--- a/src/tools/makeBaseApp
+++ b/src/tools/makeBaseApp
@@ -53,7 +53,7 @@ if [ ! -f Makefile ]; then
 		include $(TOP)/config/CONFIG_APP
 		DIRS += $(shell ls | grep App )
 		DIRS += iocBoot
-		include $(EPICS_BASE)/config/RULES_TOP
+		include $(TOP)/config/RULES_TOP
 	END
 fi
 
@@ -63,15 +63,19 @@ if [ ! -d config ]; then
 		#CONFIG
 		# Add any changes to make rules here
 		#CROSS_COMPILER_TARGET_ARCHS = mv167
-		#SHARE_BIN = $(SHARE)/bin/$(T_A)
-		#ifdef MASTER_IOCAPPS
-		#MASTER_IOCAPPS_BIN = $(MASTER_IOCAPPS)/bin/$(T_A)
-		#endif
 	END
 	cat > config/CONFIG_APP <<-\END
 		#CONFIG_APP DO NOT EDIT THIS FILE
 		include $(TOP)/config/RELEASE
 		include $(EPICS_BASE)/config/CONFIG
+		ifdef SHARE
+		USR_INCLUDES += -I$(SHARE)/include
+		SHARE_BIN = $(SHARE)/bin/$(T_A)
+		endif
+		ifdef MASTER_IOCAPPS
+		USR_INCLUDES += -I$(MASTER_IOCAPPS)/include
+		MASTER_IOCAPPS_BIN = $(MASTER_IOCAPPS)/bin/$(T_A)
+		endif
 		include $(TOP)/config/CONFIG
 	END
 	cat > config/RELEASE <<-END
@@ -87,19 +91,11 @@ if [ ! -d config ]; then
 	cat > config/RULES.Host <<-\END
 		#RULES.Host
 		include $(EPICS_BASE)/config/RULES.Host
-		ifdef MASTER_IOCAPPS
-		USR_INCLUDES += -I$(MASTER_IOCAPPS)/include
-		endif
-		USR_INCLUDES += -I$(SHARE)/include
 	END
 	cat > config/RULES.Vx <<-\END
 		#RULES.Vx
 		include $(EPICS_BASE)/config/RULES.Vx
 		VX_WARN_YES = -Wall -pedantic
-		ifdef MASTER_IOCAPPS
-		USR_INCLUDES += -I$(MASTER_IOCAPPS)/include
-		endif
-		USR_INCLUDES += -I$(SHARE)/include
 	END
 	cat > config/RULES.ioc <<-\END
 		#RULES.ioc
@@ -117,6 +113,7 @@ if [ ! -d config ]; then
 #RULES_TOP
 include $(EPICS_BASE)/config/RULES_TOP
 
+ifdef MASTER_IOCAPPS
 inc: softlinks
 buildInstall: softlinks
 
@@ -127,6 +124,7 @@ softlinks:
 	done; fi
 
 .PHONY :: softlinks
+endif
 END
 fi
 
@@ -141,10 +139,18 @@ do
 	cat > Makefile <<-\END
 		TOP = ..
 		include $(TOP)/config/CONFIG_APP
-		DIRS = src
-		include $(EPICS_BASE)/config/RULES_DIRS
+		DIRS += $(shell ls | grep src )
+		DIRS += $(shell ls | grep Db )
+		include $(TOP)/config/RULES_DIRS
 	END
     mkdir Db
+	cat > Db/Makefile <<-\END
+		TOP = ../..
+		T_A=$(HOST_ARCH)
+		include $(TOP)/config/CONFIG_APP
+		
+		include $(TOP)/config/RULES_DIRS
+	END
     if [ -n "${EXAMPLES}" ]; then
     #if source starts with blank tab replace by tab
 	sed -e "s/ 	/	/" > Db/dbExample.db <<-\END
@@ -206,7 +212,7 @@ do
 	cat > src/Makefile <<-\END
 		TOP=../..
 		include $(TOP)/config/CONFIG_APP
-		include $(EPICS_BASE)/config/RULES_ARCHS
+		include $(TOP)/config/RULES_ARCHS
 	END
 	sed -e "s/APPNAME/${APPNAME}/" > src/Makefile.Vx <<-\END
 		# Makefile.Vx
@@ -299,12 +305,12 @@ do
     if [ -f ${EPICS_BASE}/dbd/base.dbd ]; then
         cp ${EPICS_BASE}/dbd/base.dbd src/base.dbd
     else
-        echo "${EPICS_BASE}/dbdbase.dbd does not exist"
+        echo "${EPICS_BASE}/dbd/base.dbd does not exist"
     fi
     if [ -f ${EPICS_BASE}/dbd/baseLIBOBJS ]; then
         cp ${EPICS_BASE}/dbd/baseLIBOBJS src/baseLIBOBJS
     else
-        echo "${EPICS_BASE}/baseLIBOBJS does not exist"
+        echo "${EPICS_BASE}/dbd/baseLIBOBJS does not exist"
     fi
     if [ -n "${EXAMPLES}" ]; then
 	#if source starts with blank tab replace by tab