From e26250765338220f54461c09d437446c5c1b4141 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Fri, 29 May 1998 19:26:58 +0000
Subject: [PATCH] Still changing

---
 src/makeBaseApp/top/Makefile                  |  4 +-
 src/makeBaseApp/top/config/RELEASE            |  2 -
 src/makeBaseApp/top/config/RULES.Db           | 10 +----
 src/makeBaseApp/top/config/RULES.iocBoot      |  7 ---
 src/makeBaseApp/top/config/RULES_TOP          | 13 ------
 src/makeBaseApp/top/config/makeNfsCommands.pl | 15 -------
 src/makeBaseApp/top/config/makeSoftLinks      | 44 -------------------
 src/makeBaseApp/top/exampleBoot/ioc/st.cmd    |  2 +
 src/makeBaseApp/top/simpleBoot/ioc/st.cmd     |  2 +
 9 files changed, 8 insertions(+), 91 deletions(-)
 delete mode 100644 src/makeBaseApp/top/config/makeNfsCommands.pl
 delete mode 100644 src/makeBaseApp/top/config/makeSoftLinks

diff --git a/src/makeBaseApp/top/Makefile b/src/makeBaseApp/top/Makefile
index b9c0bd945..9b46f54a6 100644
--- a/src/makeBaseApp/top/Makefile
+++ b/src/makeBaseApp/top/Makefile
@@ -2,5 +2,7 @@
 TOP = .
 include $(TOP)/config/CONFIG_APP
 DIRS += $(wildcard *App)
-DIRS += iocBoot
+DIRS += $(wildcard *app)
+DIRS += $(wildcard iocBoot)
+DIRS += $(wildcard iocboot)
 include $(TOP)/config/RULES_TOP
diff --git a/src/makeBaseApp/top/config/RELEASE b/src/makeBaseApp/top/config/RELEASE
index 7a1e165ad..5d33f6462 100644
--- a/src/makeBaseApp/top/config/RELEASE
+++ b/src/makeBaseApp/top/config/RELEASE
@@ -2,5 +2,3 @@
 EPICS_BASE=_EPICS_BASE_
 TEMPLATE_TOP=_TEMPLATE_TOP_
 #SHARE=
-#MASTER_IOCAPPS only works if operating system supports soft links
-#MASTER_IOCAPPS=
diff --git a/src/makeBaseApp/top/config/RULES.Db b/src/makeBaseApp/top/config/RULES.Db
index 737b29845..ead3cc1f6 100644
--- a/src/makeBaseApp/top/config/RULES.Db
+++ b/src/makeBaseApp/top/config/RULES.Db
@@ -9,18 +9,10 @@ actionArchTargets = $(foreach action, $(ACTIONS) install,\
  
 all install :: inc buildInstall
 
-buildInstall: .DEPENDS dbd $(DBFROMSCH) $(DBFROMTEMPLATE) $(INDDBFROMTEMPLATE) $(PROD)
+buildInstall: .DEPENDS $(DBFROMSCH) $(DBFROMTEMPLATE) $(INDDBFROMTEMPLATE) $(PROD)
 
 inc build depends:
 
-$(TOP)/dbd:
-	$(MKDIR) $(TOP)/dbd
-
-dbd:	$(TOP)/dbd
-ifndef WIN32
-	ln -s $(TOP)/dbd dbd
-endif
-
 #### The following section is added to
 #### allow optimized databases to be built
 #### from capfast schematics
diff --git a/src/makeBaseApp/top/config/RULES.iocBoot b/src/makeBaseApp/top/config/RULES.iocBoot
index 8f6807248..60988fd05 100644
--- a/src/makeBaseApp/top/config/RULES.iocBoot
+++ b/src/makeBaseApp/top/config/RULES.iocBoot
@@ -2,10 +2,3 @@
 DIRS += $(wildcard ioc*)
 DIRS += $(wildcard as*)
 include $(EPICS_BASE)/config/RULES_DIRS
-buildInstall:: nfs.cmd
-
-nfs.cmd: nfsCommands
-	$(PERL) $(TOP)/config/makeNfsCommands.pl
-
-clean::
-	@$(RM) nfs.cmd
diff --git a/src/makeBaseApp/top/config/RULES_TOP b/src/makeBaseApp/top/config/RULES_TOP
index d693b2e1f..3e0bea598 100644
--- a/src/makeBaseApp/top/config/RULES_TOP
+++ b/src/makeBaseApp/top/config/RULES_TOP
@@ -1,15 +1,2 @@
 #RULES_TOP
 include $(EPICS_BASE)/config/RULES_TOP
-
-ifdef MASTER_IOCAPPS
-inc:	softlinks
-buildInstall:	softlinks
-
-softlinks:
-	@echo "softlinks" ; if [ "$(MASTER_IOCAPPS)" ]; then \
-	for DIR in bin lib dbd include man ; do \
-	$(TOP)/config/makeSoftLinks $(MASTER_IOCAPPS) $${DIR} ;\
-	done; fi
-
-.PHONY :: softlinks
-endif
diff --git a/src/makeBaseApp/top/config/makeNfsCommands.pl b/src/makeBaseApp/top/config/makeNfsCommands.pl
deleted file mode 100644
index e52b0f108..000000000
--- a/src/makeBaseApp/top/config/makeNfsCommands.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
-    if $running_under_some_shell; # makeNfsCommands.pl
-
-use Cwd;
-
-$cwd  = cwd();
-
-unlink("nfs.cmd");
-open(INP,"<nfsCommands") and open(OUT,">nfs.cmd")
-    or die "$! Copying nfsCommands to nfs.cmd";
-while (<INP>) {
-    print OUT $_;
-}
-print OUT "cd \"$cwd\"\n";
-close INP; close OUT;
diff --git a/src/makeBaseApp/top/config/makeSoftLinks b/src/makeBaseApp/top/config/makeSoftLinks
deleted file mode 100644
index a5efd087b..000000000
--- a/src/makeBaseApp/top/config/makeSoftLinks
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#makeSoftLinks
-#This shell program makes soft links to everything in MASTER_IOCAPPS/bin/*
-#set -xv
-
-SAVEDIR=$PWD
-Cleanup() {
-    cd $SAVEDIR
-    rtncode=$1
-    shift 1
-    for MESSAGE
-    do
-        echo "$MESSAGE"
-    done
-    exit $rtncode
-}
-USAGE="Usage: makeSoftLinks MASTER_IOCAPPS dir"
-
-if [ $# != 2 ]; then Cleanup 1 "Illegal number args" "$USAGE"; fi;
-MASTER_IOCAPPS=$1
-DIR=$2
-
-if [ ! -d ${MASTER_IOCAPPS}/${DIR} ] ; then Cleanup 0 ; fi
-
-FROM=${MASTER_IOCAPPS}/${DIR}
-if [ -z "`ls ${FROM}`" ] ; then Cleanup 0 ; fi
-if [ ! -d ${DIR} ] ; then
-    echo "mkdir ${DIR}"
-    mkdir ${DIR}
-fi
-cd ${DIR}
-for FILE in `ls ${FROM}`
-do
-    if [ -d ${FROM}/${FILE} ] ; then
-	$0 ${MASTER_IOCAPPS}/${DIR} ${FILE}
-    elif [ -f ${FROM}/${FILE} ] ; then
-        if [ ! -f "${FILE}" ]; then
-        ln -s ${MASTER_IOCAPPS}/${DIR}/${FILE} ${FILE}
-        fi
-    else
-        echo "${MASTER_IOCAPPS}/${DIR}/${FILE} Illegal."
-    fi
-done
-Cleanup 0
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
index 091d966fd..f17ef288c 100644
--- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
+++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
@@ -5,6 +5,8 @@
 
 < cdcmds
 
+#< nfsCommands
+
 cd appbin
 ld < iocCore
 ld < seq
diff --git a/src/makeBaseApp/top/simpleBoot/ioc/st.cmd b/src/makeBaseApp/top/simpleBoot/ioc/st.cmd
index e36627039..f07f2c03c 100644
--- a/src/makeBaseApp/top/simpleBoot/ioc/st.cmd
+++ b/src/makeBaseApp/top/simpleBoot/ioc/st.cmd
@@ -4,6 +4,8 @@
 
 < cdcmds
  
+#< nfsCommands
+
 cd appbin
 ld < iocCore
 ld < seq