Merge ~epics-core/epics-base/+git/Com:make-simple into ~epics-core/epics-base/+git/epics-base:7.0

[mdavidsaver]

Makefile simplifications related to the former sub-modules (libcom, ca, database) which have causing confusion, and extra complexity in packaging.

1. Remove modules/*/configure and CI leftovers. As these are no longer built separately, this is unnecessary complexity (need to set EPICS_HOST_ARCH to build in sub-dirs).

2. Remove bin/*/*ModuleDirs.pm. The Makefile rule is left (though it could be removed). Places where $(INSTALL_LOCATION) appears in generated code add complexity to packaging.

[Andrew Johnson (anj)]

Not saying that I approve of this change, but while I'm looking at what you did...

You probably didn't see these Perl errors (which only occur after a distclean):

tux% make -s -C configure
Can't locate EPICS/Path.pm in @INC (@INC contains: /local/anj/base-7.0/src/tools/../../lib/perl /home/phoebus/ANJ/perl5/lib/perl5 /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ../src/tools/convertRelease.pl line 24.
BEGIN failed--compilation aborted at ../src/tools/convertRelease.pl line 24.
Can't locate EPICS/Path.pm in @INC (@INC contains: /local/anj/base-7.0/src/tools/../../lib/perl /home/phoebus/ANJ/perl5/lib/perl5 /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ../../src/tools/convertRelease.pl line 24.
BEGIN failed--compilation aborted at ../../src/tools/convertRelease.pl line 24.
...

They are easy to fix though, just revert your changes in src/tools. Those scripts are designed to be able to be run from the src/tools directory before the build has got as far as installing them, so by including $Bin in the library search path (i.e. the path to the directory that the .pl script is actually running from) they can find the local modules they need (which also haven't been installed yet). The src/tools scripts never loaded a xxxModuleDirs file.

For the other scripts where you removed $Bin from the search path and a 'use xxxModuleDirs;', you should also remove the now unnecessary line
    no lib $Bin;
which removed $Bin from the library search path after the xxxModuleDirs file had been loaded.

[mdavidsaver (mdavidsaver)]

> ... You probably didn't see these Perl errors ...

You're right, I don't. Which is puzzling considering that I've been (re)building with this change for several months now. You see this during Base build?

[Andrew Johnson (anj)]

Yup, those errors were from the top of your branch. I just replicated them:

tux% git clone -b make-simple --reference base-7.0 git+ssh://git.launchpad.net/~epics-core/epics-base/+git/Com dev-7.0
Cloning into 'dev-7.0'...
Checking connectivity... done.
Checking out files: 100% (1733/1733), done.
tux% cd dev-7.0/
tux% make -s -C configure
Can't locate EPICS/Path.pm in @INC (@INC contains: /local/anj/dev-7.0/src/tools/../../lib/perl /home/phoebus/ANJ/perl5/lib/perl5 /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ../src/tools/convertRelease.pl line 24.
BEGIN failed--compilation aborted at ../src/tools/convertRelease.pl line 24.
Can't locate EPICS/Path.pm in @INC (@INC contains: /local/anj/dev-7.0/src/tools/../../lib/perl /home/phoebus/ANJ/perl5/lib/perl5 /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ../../src/tools/convertRelease.pl line 24.
BEGIN failed--compilation aborted at ../../src/tools/convertRelease.pl line 24.
...

They don't prevent Base from building though.

[mdavidsaver (mdavidsaver)]

This shows up in the travis build anyway.

https://travis-ci.org/mdavidsaver/epics-base/jobs/475161570

> They don't prevent Base from building though.

... because it comes from the configure/RELEASE parsing mechanics. Specifically:

> RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)

This will be empty when building Base itself, so we can just skip it.

[Andrew Johnson (anj)]

The Makefile rule for %ModuleDirs.pm cannot be removed, it will still be needed for external Perl scripts that use Perl modules from Base. The caPerl makeBaseApp template demonstrates the need.

You didn't make the changes I suggested in the last paragraph of my first comment yet: Remove the now unnecessary 'no lib $Bin;' lines from the scripts modules/database/src/tools/*.pl and modules/libcom/src/env/bldEnvData.pl where you removed a 'use ...ModuleDirs;' line.

I still object that the libcom, ca and database directories appear under modules/ when after these changes they aren't structured as modules any more. If we're going to undo their modular nature like this they should be moved back under src/ and test/.

One point of our making them modules was to move towards allowing CA and RSRV to become optional and unbundling them — are you abandoning that idea?

[Andrew Johnson (anj)]

Core Group mtg: Further exploration on Perl ModuleDirs files by ANJ; diff comments with fixes, but in principle this is acceptable.

[mdavidsaver (mdavidsaver)]

I've addressed two of three comments. I'm not going to try to make the caPerlApp example automatically set $PERL5LIB (I would rather drop it).

[mdavidsaver (mdavidsaver)]

wrt. the *ModuleDirs.pm idea. One alternative I can imagine is injecting these paths directly into the .pl before/during installation?

Though even this would raise an issue which would need to be addressed in the rpath-origin MR.

https://code.launchpad.net/~epics-core/epics-base/+git/make/+merge/359132

Isn't there some way we can avoid encoding more absolute paths in the installed tree? I'm close to getting rid of these!

[Andrew Johnson (anj)]

With the changes already included in this MR Base doesn't generate any *ModuleDirs.pm files at all, they will only be generated by support modules that explicitly ask for one. I don't understand why you appear to be so strongly opposed to Base keeping the capability of generating them for other configurations (which is all I was asking for in my first paragraph back on 2019-03-07).

I understand the need for Debian packaging to remove install absolute paths from Base's installed files. When packaging EPICS it should be possible to install all the .pm files from $(INSTALL_DIR)/lib/perl and its sub-dirs (and the libCap5.so file) under one of the system directories that Perl searches automatically — those dir's are listed under @INC at the end of the 'perl -V' output, I expect Debian tells you somewhere which to use. Then the packaging process can remove all of the 'use lib' and 'use FindBin' lines from the EPICS Perl scripts and they will still find the modules they need. The one file that might need special attention is CA.pm which uses Perl's Dynaloader to load libCap5.so but as long as the relative path from CA.pm to libCap5.so is retained, the existing code will continue to work for that.

The packaging process can also remove the similar code that adjusts @INC from the top of the caPerlApp/*.pl template files, and delete the _APPNAME_ModuleDirs.pm line from the caPerlApp/Makefile. Templates that are instantiated on a Debian system will work fine when run on a system that has the modules installed as above. The won't work on a non-Debian system without adjustment, but I don't see that as a major problem.

[mdavidsaver (mdavidsaver)]

I think we're confusing each other. So the only change you're asking for is to revert the changes to .pl files under "modules/ca/src/template/top/caPerlApp"?

[Andrew Johnson (anj)]

I don't think so since they still have the 'use _APPNAME_ModuleDirs;' lines in them. I'm not trying to undo what you've done, I was just trying to get you to agree that you won't try to remove the *ModuleDirs.pm generation rules (contrary to the second point in your "Description of Change" at the top of this Merge Request). I would like to take one more look at this before it gets merged, I might have some minor name changes (of course!).

I was also explaining how the Debian packaging could more closely integrate our Perl modules into the rest of the Debian system.

[mdavidsaver (mdavidsaver)]

> you won't try to remove the *ModuleDirs.pm generation rules

I'm not! From me, "could be removed" is an option not a plan. I would however, like to remove any usage of it in Base. I appreciate that you may not see much distance between these two points, but I do. I'm relenting on the caPerlApp template in the hope of moving things forward.

I will reiterate for emphasis that my objections include having things which aren't executables under bin/ as well as encoding __absolute__ paths in the installed tree. The former coming in part from my desire, in the long term, to see our installed tree more closely follow *NIX conventions (LSB etc.). The later from my desire in the near term to be able to copy and use the installed tree from a different path.

[mdavidsaver (mdavidsaver)]

review: Approve

[Andrew Johnson (anj)]

Still looking at this, ideas pending.

review: Needs Information (hold for anj)

[Andrew Johnson (anj)]

Videocon 9/17: Approved, some merge conflicts expected.

review: Approve

diff --git a/configure/CONFIG b/configure/CONFIG
index e40d3f5..153e69e 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -58,8 +58,12 @@ include $(CONFIG)/CONFIG_BASE_VERSION
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 
+# Parse configure/RELEASE
+# except when building Base itself, where this file is empty,
+# and would error in src/tools/ anyway.
+ifndef BASE_TOP
 RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
-
+endif
 
 ifdef T_A
 
diff --git a/modules/ca/configure/CONFIG_CA_MODULE b/configure/CONFIG_CA_MODULE
 similarity index 100%
 rename from modules/ca/configure/CONFIG_CA_MODULE
 rename to configure/CONFIG_CA_MODULE
diff --git a/modules/ca/configure/CONFIG_CA_VERSION b/configure/CONFIG_CA_VERSION
 similarity index 100%
 rename from modules/ca/configure/CONFIG_CA_VERSION
 rename to configure/CONFIG_CA_VERSION
diff --git a/modules/database/configure/CONFIG_DATABASE_MODULE b/configure/CONFIG_DATABASE_MODULE
 similarity index 100%
 rename from modules/database/configure/CONFIG_DATABASE_MODULE
 rename to configure/CONFIG_DATABASE_MODULE
diff --git a/modules/database/configure/CONFIG_DATABASE_VERSION b/configure/CONFIG_DATABASE_VERSION
 similarity index 100%
 rename from modules/database/configure/CONFIG_DATABASE_VERSION
 rename to configure/CONFIG_DATABASE_VERSION
diff --git a/modules/libcom/configure/CONFIG_LIBCOM_MODULE b/configure/CONFIG_LIBCOM_MODULE
 similarity index 64%
 rename from modules/libcom/configure/CONFIG_LIBCOM_MODULE
 rename to configure/CONFIG_LIBCOM_MODULE
index 175606c..32bb937 100644
--- a/modules/libcom/configure/CONFIG_LIBCOM_MODULE
+++ b/configure/CONFIG_LIBCOM_MODULE
@@ -5,18 +5,10 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Set EPICS_LIBCOM if necessary
-ifndef EPICS_LIBCOM
-  EPICS_LIBCOM = $(if $(BUILDING_LIBCOM),$(INSTALL_LOCATION),$(EPICS_BASE))
-
-  # Paths to tools built here
-  EPICS_LIBCOM_HOST_BIN ?= $(EPICS_LIBCOM)/bin/$(EPICS_HOST_ARCH)
-endif
-
 # Set location of locally generated tools
-YACC = $(abspath $(EPICS_LIBCOM_HOST_BIN))/antelope$(HOSTEXE)
-LEX = $(abspath $(EPICS_LIBCOM_HOST_BIN))/e_flex$(HOSTEXE) \
-        -S$(EPICS_LIBCOM)/include/flex.skel.static
+YACC = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/antelope$(HOSTEXE)
+LEX = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/e_flex$(HOSTEXE) \
+        -S$(EPICS_BASE)/include/flex.skel.static
 
 # Default stack size for osiThread
 OSITHREAD_USE_DEFAULT_STACK = NO
diff --git a/modules/libcom/configure/CONFIG_LIBCOM_VERSION b/configure/CONFIG_LIBCOM_VERSION
 similarity index 100%
 rename from modules/libcom/configure/CONFIG_LIBCOM_VERSION
 rename to configure/CONFIG_LIBCOM_VERSION
diff --git a/configure/Makefile b/configure/Makefile
index 3778797..f48278d 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -20,5 +20,14 @@ CONFIGS += $(subst ../,,$(wildcard ../os/CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../RELEASE*))
 CONFIGS += $(subst ../,,$(wildcard ../RULES*))
 
+CFG += CONFIG_LIBCOM_MODULE
+CFG += CONFIG_LIBCOM_VERSION
+
+CFG += CONFIG_CA_MODULE
+CFG += CONFIG_CA_VERSION
+
+CFG += CONFIG_DATABASE_MODULE
+CFG += CONFIG_DATABASE_VERSION
+
 include $(TOP)/configure/RULES
 
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 2a78a96..6267889 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -190,7 +190,7 @@ endif
 checkRelease:
 	+$(CONVERTRELEASE) checkRelease
 warnRelease:
-	-$(CONVERTRELEASE) checkRelease
+	$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
 	$(info Warning: RELEASE file consistency checks have been disabled)
@@ -350,7 +350,7 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 
 runtests: $(TESTSCRIPTS)
 ifdef RUNTESTS_ENABLED
-	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
+	$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
 endif
 
 testspec: $(TESTSCRIPTS)
@@ -385,7 +385,7 @@ junitfiles: $(JUNITFILES)
 # A .tap file is the output from running the associated test script
 %.tap: %.t
 ifdef RUNTESTS_ENABLED
-	-$(PERL) $< -tap > $@
+	$(PERL) $< -tap > $@
 endif
 
 %.xml: %.tap
diff --git a/modules/Makefile b/modules/Makefile
index 0ed2b0e..ae221de 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -7,15 +7,15 @@ TOP = ..
 include $(TOP)/configure/CONFIG
 include CONFIG_SITE.local
 
-# Submodules for bundle build
-SUBMODULES += libcom
+DIRS += libcom
 
-SUBMODULES += ca
+DIRS += ca
 ca_DEPEND_DIRS = libcom
 
-SUBMODULES += database
+DIRS += database
 database_DEPEND_DIRS = ca
 
+# Submodules for bundle build
 SUBMODULES += pvData
 pvData_DEPEND_DIRS = libcom
 
diff --git a/modules/ca/.ci/travis-build.sh b/modules/ca/.ci/travis-build.sh
 deleted file mode 100755
index 622979b..0000000
--- a/modules/ca/.ci/travis-build.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e -x
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 $EXTRA
-
-if [ "$TEST" != "NO" ]
-then
-  make -j2 tapfiles
-  make -s test-results
-fi
diff --git a/modules/ca/.ci/travis-prepare.sh b/modules/ca/.ci/travis-prepare.sh
 deleted file mode 100755
index 85dc8d7..0000000
--- a/modules/ca/.ci/travis-prepare.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh
-set -e -x
-
-CURDIR="$PWD"
-
-QDIR="$HOME/.cache/qemu"
-
-if [ -n "$RTEMS" -a "$TEST" = "YES" ]
-then
-  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
-  cd "$HOME/.build/qemu"
-
-  HEAD=`git log -n1 --pretty=format:%H`
-  echo "HEAD revision $HEAD"
-
-  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
-  echo "Cached revision $BUILT"
-
-  if [ "$HEAD" != "$BUILT" ]
-  then
-    echo "Building QEMU"
-    git submodule --quiet update --init
-
-    install -d "$HOME/.build/qemu/build"
-    cd         "$HOME/.build/qemu/build"
-
-    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
-    make -j2
-    make install
-
-    echo "$HEAD" > "$HOME/.cache/qemu/built"
-  fi
-fi
-
-cd "$CURDIR"
-
-cat << EOF > configure/RELEASE.local
-EPICS_BASE=$HOME/.source/epics-base
-EOF
-
-install -d "$HOME/.source"
-cd "$HOME/.source"
-
-add_base_module() {
-  MODULE=$1
-  BRANCH=$2
-  ( cd epics-base/modules && \
-  git clone --quiet --depth 5 --branch "$MODULE"/"$BRANCH" https://github.com/${REPOBASE:-epics-base}/epics-base.git "$MODULE" && \
-  cd "$MODULE" && git log -n1 )
-}
-
-git clone --quiet --depth 5 --branch core/"${BRCORE:-master}" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
-( cd epics-base && git log -n1 )
-add_base_module libcom "${BRLIBCOM:-master}"
-
-EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
-
-# requires wine and g++-mingw-w64-i686
-if [ "$WINE" = "32" ]
-then
-  echo "Cross mingw32"
-  sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-CMPLR_PREFIX=i686-w64-mingw32-
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
-EOF
-fi
-
-if [ "$STATIC" = "YES" ]
-then
-  echo "Build static libraries/executables"
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-SHARED_LIBRARIES=NO
-STATIC_BUILD=YES
-EOF
-fi
-
-case "$CMPLR" in
-clang)
-  echo "Host compiler is clang"
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++
-EOF
-
-  # hack
-  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
-
-  clang --version
-  ;;
-*)
-  echo "Host compiler is default"
-  gcc --version
-  ;;
-esac
-
-cat <<EOF >> epics-base/configure/CONFIG_SITE
-USR_CPPFLAGS += $USR_CPPFLAGS
-USR_CFLAGS += $USR_CFLAGS
-USR_CXXFLAGS += $USR_CXXFLAGS
-EOF
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  echo "Cross RTEMS${RTEMS} for pc386"
-  install -d /home/travis/.cache
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
-  | tar -C /home/travis/.cache -xj
-
-  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-RTEMS_VERSION=$RTEMS
-RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
-EOF
-
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 -C epics-base $EXTRA
diff --git a/modules/ca/.travis.yml b/modules/ca/.travis.yml
 deleted file mode 100644
index 5a99b88..0000000
--- a/modules/ca/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-sudo: false
-dist: trusty
-language: c
-compiler:
-  - gcc
-addons:
-  apt:
-    packages:
-    - libreadline6-dev
-    - libncurses5-dev
-    - perl
-    - clang
-    - g++-mingw-w64-i686
-install:
- - ./.ci/travis-prepare.sh
-script:
- - ./.ci/travis-build.sh
-env:
- - BRCORE=master BRLIBCOM=master TEST=NO
- - CMPLR=clang TEST=NO
- - USR_CXXFLAGS=-std=c++11 TEST=NO
- - CMPLR=clang USR_CXXFLAGS=-std=c++11 TEST=NO
- - WINE=32 TEST=NO STATIC=YES
- - WINE=32 TEST=NO STATIC=NO
- - RTEMS=4.10 TEST=NO
- - RTEMS=4.9 TEST=NO
diff --git a/modules/ca/Makefile b/modules/ca/Makefile
index 13feff6..eeb147b 100644
--- a/modules/ca/Makefile
+++ b/modules/ca/Makefile
@@ -7,11 +7,9 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = .
+TOP = ../..
 include $(TOP)/configure/CONFIG
 
-DIRS += configure src
-
-src_DEPEND_DIRS = configure
+DIRS += src
 
 include $(TOP)/configure/RULES_TOP
diff --git a/modules/ca/configure/CONFIG b/modules/ca/configure/CONFIG
 deleted file mode 100644
index 331fd70..0000000
--- a/modules/ca/configure/CONFIG
+++ /dev/null
@@ -1,28 +0,0 @@
-# CONFIG - Load build configuration data
-#
-# Do not make changes to this file!
-
-# Allow user to override where the build rules come from
-RULES = $(EPICS_BASE)
-
-# RELEASE files point to other application tops
-include $(TOP)/configure/RELEASE
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
-ifdef T_A
--include $(TOP)/configure/RELEASE.Common.$(T_A)
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-endif
-
-CONFIG = $(RULES)/configure
-include $(CONFIG)/CONFIG
-
-# Override the Base definition:
-INSTALL_LOCATION = $(TOP)
-
-# CONFIG_SITE files contain other build configuration settings
-include $(TOP)/configure/CONFIG_SITE
--include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-ifdef T_A
- -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
- -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-endif
diff --git a/modules/ca/configure/CONFIG_SITE b/modules/ca/configure/CONFIG_SITE
 deleted file mode 100644
index d78c7f5..0000000
--- a/modules/ca/configure/CONFIG_SITE
+++ /dev/null
@@ -1,42 +0,0 @@
-# CONFIG_SITE
-
-# Make any application-specific changes to the EPICS build
-#   configuration variables in this file.
-#
-# Host/target specific settings can be specified in files named
-#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-#   CONFIG_SITE.Common.$(T_A)
-#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
-# CHECK_RELEASE controls the consistency checking of the support
-#   applications pointed to by the RELEASE* files.
-# Normally CHECK_RELEASE should be set to YES.
-# Set CHECK_RELEASE to NO to disable checking completely.
-# Set CHECK_RELEASE to WARN to perform consistency checking but
-#   continue building even if conflicts are found.
-CHECK_RELEASE = YES
-
-# Set this when you only want to compile this application
-#   for a subset of the cross-compiled target architectures
-#   that Base is built for.
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
-
-# To install files into a location other than $(TOP) define
-#   INSTALL_LOCATION here.
-#INSTALL_LOCATION=</absolute/path/to/install/top>
-
-# Set this when the IOC and build host use different paths
-#   to the install location. This may be needed to boot from
-#   a Microsoft FTP server say, or on some NFS configurations.
-#IOCS_APPL_TOP = </IOC's/absolute/path/to/install/top>
-
-# For application debugging purposes, override the HOST_OPT and/
-#   or CROSS_OPT settings from base/configure/CONFIG_SITE
-#HOST_OPT = NO
-#CROSS_OPT = NO
-
-# These allow developers to override the CONFIG_SITE variable
-# settings without having to modify the configure/CONFIG_SITE
-# file itself.
--include $(TOP)/../CONFIG_SITE.local
--include $(TOP)/configure/CONFIG_SITE.local
diff --git a/modules/ca/configure/Makefile b/modules/ca/configure/Makefile
 deleted file mode 100644
index e2f3738..0000000
--- a/modules/ca/configure/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#*************************************************************************
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP = ..
-
-include $(TOP)/configure/CONFIG
-
-TARGETS = $(CONFIG_TARGETS)
-CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
-
-CFG += CONFIG_CA_MODULE
-CFG += CONFIG_CA_VERSION
-
-include $(TOP)/configure/RULES
diff --git a/modules/ca/configure/RELEASE b/modules/ca/configure/RELEASE
 deleted file mode 100644
index a2d9f55..0000000
--- a/modules/ca/configure/RELEASE
+++ /dev/null
@@ -1,39 +0,0 @@
-# RELEASE - Location of external support modules
-#
-# IF YOU CHANGE ANY PATHS in this file or make API changes to
-# any modules it refers to, you should do a "make rebuild" in
-# this application's top level directory.
-#
-# The EPICS build process does not check dependencies against
-# any files from outside the application, so it is safest to
-# rebuild it completely if any modules it depends on change.
-#
-# Host- or target-specific settings can be given in files named
-#  RELEASE.$(EPICS_HOST_ARCH).Common
-#  RELEASE.Common.$(T_A)
-#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-#
-# This file is parsed by both GNUmake and an EPICS Perl script,
-# so it may ONLY contain definititions of paths to other support
-# modules, variable definitions that are used in module paths,
-# and include statements that pull in other RELEASE files.
-# Variables may be used before their values have been set.
-# Build variables that are NOT used in paths should be set in
-# the CONFIG_SITE file.
-
-# Variables and paths to dependent modules:
-#MODULES = /path/to/modules
-#MYMODULE = $(MODULES)/my-module
-
-# If building the EPICS modules individually, set these:
-#EPICS_LIBCOM = $(MODULES)/libcom-3.17.0
-#EPICS_BASE = $(MODULES)/core-7.0.1
-
-# Set RULES here if you want to use build rules from elsewhere:
-#RULES = $(MODULES)/build-rules
-
-# These lines allow developers to override these RELEASE settings
-# without having to modify this file directly.
--include $(TOP)/../RELEASE.local
--include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
--include $(TOP)/configure/RELEASE.local
diff --git a/modules/ca/configure/RULES b/modules/ca/configure/RULES
 deleted file mode 100644
index 6d56e14..0000000
--- a/modules/ca/configure/RULES
+++ /dev/null
@@ -1,6 +0,0 @@
-# RULES
-
-include $(CONFIG)/RULES
-
-# Library should be rebuilt because LIBOBJS may have changed.
-$(LIBNAME): ../Makefile
diff --git a/modules/ca/configure/RULES_DIRS b/modules/ca/configure/RULES_DIRS
 deleted file mode 100644
index 3ba269d..0000000
--- a/modules/ca/configure/RULES_DIRS
+++ /dev/null
@@ -1,2 +0,0 @@
-#RULES_DIRS
-include $(CONFIG)/RULES_DIRS
diff --git a/modules/ca/configure/RULES_TOP b/modules/ca/configure/RULES_TOP
 deleted file mode 100644
index 2b8cbc6..0000000
--- a/modules/ca/configure/RULES_TOP
+++ /dev/null
@@ -1,2 +0,0 @@
-#RULES_TOP
-include $(CONFIG)/RULES_TOP
diff --git a/modules/ca/src/Makefile b/modules/ca/src/Makefile
index 650b355..335cec6 100644
--- a/modules/ca/src/Makefile
+++ b/modules/ca/src/Makefile
@@ -7,7 +7,7 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ..
+TOP = ../../..
 include $(TOP)/configure/CONFIG
 
 # Channel Access Client
diff --git a/modules/ca/src/client/Makefile b/modules/ca/src/client/Makefile
index c5fc5c4..cae6ee0 100644
--- a/modules/ca/src/client/Makefile
+++ b/modules/ca/src/client/Makefile
@@ -6,8 +6,8 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
-
-TOP = ../..
+CURDIR := $(or $(dir $(lastword $(MAKEFILE_LIST))), .)
+TOP = ../../../..
 
 include $(TOP)/configure/CONFIG
 
@@ -109,7 +109,7 @@ EXPAND += S99caRepeater@
 EXPAND += caRepeater.service@
 EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN))
 
-SRC_DIRS += $(TOP)/src/client/test
+SRC_DIRS += $(CURDIR)/test
 PROD_HOST += ca_test
 ca_test_SRCS = ca_test_main.c ca_test.c
 ca_test_LIBS  = ca Com
diff --git a/modules/ca/src/perl/Makefile b/modules/ca/src/perl/Makefile
index 7890f34..65619e9 100644
--- a/modules/ca/src/perl/Makefile
+++ b/modules/ca/src/perl/Makefile
@@ -5,7 +5,7 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ../..
+TOP = ../../../..
 include $(TOP)/configure/CONFIG
 
 ifdef T_A
@@ -55,8 +55,6 @@ ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32
   PERL_MODULES += CA.pm
   PERL_MODULES += $(PERL_ARCHPATH)/$(LOADABLE_SHRLIB_PREFIX)Cap5$(LOADABLE_SHRLIB_SUFFIX)
 
-  PERL_SCRIPTS += caModuleDirs.pm
-
   HTMLS_DIR = .
   HTMLS = CA.html
 endif
diff --git a/modules/ca/src/perl/capr.pl b/modules/ca/src/perl/capr.pl
index e551afc..21e56ec 100644
--- a/modules/ca/src/perl/capr.pl
+++ b/modules/ca/src/perl/capr.pl
@@ -10,9 +10,7 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use caModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use Getopt::Std;
 use EPICS::Path;
diff --git a/modules/ca/src/template/Makefile b/modules/ca/src/template/Makefile
index 913d92b..8683dfd 100644
--- a/modules/ca/src/template/Makefile
+++ b/modules/ca/src/template/Makefile
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
diff --git a/modules/ca/src/tools/Makefile b/modules/ca/src/tools/Makefile
index 7ebcc02..c56e21e 100644
--- a/modules/ca/src/tools/Makefile
+++ b/modules/ca/src/tools/Makefile
@@ -9,7 +9,7 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ../..
+TOP = ../../../..
 
 include $(TOP)/configure/CONFIG
 
diff --git a/modules/database/.ci/travis-build.sh b/modules/database/.ci/travis-build.sh
 deleted file mode 100755
index 622979b..0000000
--- a/modules/database/.ci/travis-build.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e -x
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 $EXTRA
-
-if [ "$TEST" != "NO" ]
-then
-  make -j2 tapfiles
-  make -s test-results
-fi
diff --git a/modules/database/.ci/travis-prepare.sh b/modules/database/.ci/travis-prepare.sh
 deleted file mode 100755
index ce2c18b..0000000
--- a/modules/database/.ci/travis-prepare.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-set -e -x
-
-CURDIR="$PWD"
-
-QDIR="$HOME/.cache/qemu"
-
-if [ -n "$RTEMS" -a "$TEST" = "YES" ]
-then
-  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
-  cd "$HOME/.build/qemu"
-
-  HEAD=`git log -n1 --pretty=format:%H`
-  echo "HEAD revision $HEAD"
-
-  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
-  echo "Cached revision $BUILT"
-
-  if [ "$HEAD" != "$BUILT" ]
-  then
-    echo "Building QEMU"
-    git submodule --quiet update --init
-
-    install -d "$HOME/.build/qemu/build"
-    cd         "$HOME/.build/qemu/build"
-
-    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
-    make -j2
-    make install
-
-    echo "$HEAD" > "$HOME/.cache/qemu/built"
-  fi
-fi
-
-cd "$CURDIR"
-
-cat << EOF > configure/RELEASE.local
-EPICS_BASE=$HOME/.source/epics-base
-EOF
-
-install -d "$HOME/.source"
-cd "$HOME/.source"
-
-add_base_module() {
-  MODULE=$1
-  BRANCH=$2
-  ( cd epics-base/modules && \
-  git clone --quiet --depth 5 --branch "$MODULE"/"$BRANCH" https://github.com/${REPOBASE:-epics-base}/epics-base.git "$MODULE" && \
-  cd "$MODULE" && git log -n1 )
-}
-
-git clone --quiet --depth 5 --branch core/"${BRCORE:-master}" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
-( cd epics-base && git log -n1 )
-add_base_module libcom "${BRLIBCOM:-master}"
-add_base_module ca "${BRCA:-master}"
-
-EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
-
-# requires wine and g++-mingw-w64-i686
-if [ "$WINE" = "32" ]
-then
-  echo "Cross mingw32"
-  sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-CMPLR_PREFIX=i686-w64-mingw32-
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
-EOF
-fi
-
-if [ "$STATIC" = "YES" ]
-then
-  echo "Build static libraries/executables"
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-SHARED_LIBRARIES=NO
-STATIC_BUILD=YES
-EOF
-fi
-
-case "$CMPLR" in
-clang)
-  echo "Host compiler is clang"
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++
-EOF
-
-  # hack
-  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
-
-  clang --version
-  ;;
-*)
-  echo "Host compiler is default"
-  gcc --version
-  ;;
-esac
-
-cat <<EOF >> epics-base/configure/CONFIG_SITE
-USR_CPPFLAGS += $USR_CPPFLAGS
-USR_CFLAGS += $USR_CFLAGS
-USR_CXXFLAGS += $USR_CXXFLAGS
-EOF
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  echo "Cross RTEMS${RTEMS} for pc386"
-  install -d /home/travis/.cache
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
-  | tar -C /home/travis/.cache -xj
-
-  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-RTEMS_VERSION=$RTEMS
-RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
-EOF
-
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 -C epics-base $EXTRA
diff --git a/modules/database/.travis.yml b/modules/database/.travis.yml
 deleted file mode 100644
index 127ae7b..0000000
--- a/modules/database/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-sudo: false
-dist: trusty
-language: c
-compiler:
-  - gcc
-addons:
-  apt:
-    packages:
-    - libreadline6-dev
-    - libncurses5-dev
-    - perl
-    - clang
-    - g++-mingw-w64-i686
-install:
- - ./.ci/travis-prepare.sh
-script:
- - ./.ci/travis-build.sh
-env:
- - BRCORE=master BRLIBCOM=master BRCA=master
- - CMPLR=clang
- - USR_CXXFLAGS=-std=c++11
- - CMPLR=clang USR_CXXFLAGS=-std=c++11
- - WINE=32 TEST=NO STATIC=YES
- - WINE=32 TEST=NO STATIC=NO
- - RTEMS=4.10 TEST=NO
- - RTEMS=4.9 TEST=NO
diff --git a/modules/database/Makefile b/modules/database/Makefile
index 9998e6c..9bb746e 100644
--- a/modules/database/Makefile
+++ b/modules/database/Makefile
@@ -7,11 +7,10 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = .
+TOP = ../..
 include $(TOP)/configure/CONFIG
 
-DIRS += configure src
-src_DEPEND_DIRS = configure
+DIRS += src
 
 DIRS += test
 test_DEPEND_DIRS = src
diff --git a/modules/database/configure/CONFIG b/modules/database/configure/CONFIG
 deleted file mode 100644
index c471407..0000000
--- a/modules/database/configure/CONFIG
+++ /dev/null
@@ -1,36 +0,0 @@
-# CONFIG - Load build configuration data
-#
-# Do not make changes to this file!
-
-# Allow user to override where the build rules come from
-RULES = $(EPICS_BASE)
-
-# RELEASE files point to other application tops
-include $(TOP)/configure/RELEASE
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
-ifdef T_A
--include $(TOP)/configure/RELEASE.Common.$(T_A)
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-endif
-
-BUILDING_DATABASE = DEFINED
-
-CONFIG = $(RULES)/configure
-include $(CONFIG)/CONFIG
-
-# Override the Base definition:
-INSTALL_LOCATION = $(TOP)
-
-# Use new RSET definition
-BASE_CPPFLAGS += -DUSE_TYPED_RSET
-
-# Shared library ABI version.
-SHRLIB_VERSION = $(EPICS_DATABASE_MAJOR_VERSION).$(EPICS_DATABASE_MINOR_VERSION).$(EPICS_DATABASE_MAINTENANCE_VERSION)
-
-# CONFIG_SITE files contain other build configuration settings
-include $(TOP)/configure/CONFIG_SITE
--include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-ifdef T_A
- -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
- -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-endif
diff --git a/modules/database/configure/CONFIG_SITE b/modules/database/configure/CONFIG_SITE
 deleted file mode 100644
index d78c7f5..0000000
--- a/modules/database/configure/CONFIG_SITE
+++ /dev/null
@@ -1,42 +0,0 @@
-# CONFIG_SITE
-
-# Make any application-specific changes to the EPICS build
-#   configuration variables in this file.
-#
-# Host/target specific settings can be specified in files named
-#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-#   CONFIG_SITE.Common.$(T_A)
-#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
-# CHECK_RELEASE controls the consistency checking of the support
-#   applications pointed to by the RELEASE* files.
-# Normally CHECK_RELEASE should be set to YES.
-# Set CHECK_RELEASE to NO to disable checking completely.
-# Set CHECK_RELEASE to WARN to perform consistency checking but
-#   continue building even if conflicts are found.
-CHECK_RELEASE = YES
-
-# Set this when you only want to compile this application
-#   for a subset of the cross-compiled target architectures
-#   that Base is built for.
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
-
-# To install files into a location other than $(TOP) define
-#   INSTALL_LOCATION here.
-#INSTALL_LOCATION=</absolute/path/to/install/top>
-
-# Set this when the IOC and build host use different paths
-#   to the install location. This may be needed to boot from
-#   a Microsoft FTP server say, or on some NFS configurations.
-#IOCS_APPL_TOP = </IOC's/absolute/path/to/install/top>
-
-# For application debugging purposes, override the HOST_OPT and/
-#   or CROSS_OPT settings from base/configure/CONFIG_SITE
-#HOST_OPT = NO
-#CROSS_OPT = NO
-
-# These allow developers to override the CONFIG_SITE variable
-# settings without having to modify the configure/CONFIG_SITE
-# file itself.
--include $(TOP)/../CONFIG_SITE.local
--include $(TOP)/configure/CONFIG_SITE.local
diff --git a/modules/database/configure/Makefile b/modules/database/configure/Makefile
 deleted file mode 100644
index dd29209..0000000
--- a/modules/database/configure/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#*************************************************************************
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP = ..
-
-include $(TOP)/configure/CONFIG
-
-TARGETS = $(CONFIG_TARGETS)
-CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
-
-CFG += CONFIG_DATABASE_MODULE
-CFG += CONFIG_DATABASE_VERSION
-
-include $(TOP)/configure/RULES
diff --git a/modules/database/configure/RELEASE b/modules/database/configure/RELEASE
 deleted file mode 100644
index 9b685a1..0000000
--- a/modules/database/configure/RELEASE
+++ /dev/null
@@ -1,40 +0,0 @@
-# RELEASE - Location of external support modules
-#
-# IF YOU CHANGE ANY PATHS in this file or make API changes to
-# any modules it refers to, you should do a "make rebuild" in
-# this application's top level directory.
-#
-# The EPICS build process does not check dependencies against
-# any files from outside the application, so it is safest to
-# rebuild it completely if any modules it depends on change.
-#
-# Host- or target-specific settings can be given in files named
-#  RELEASE.$(EPICS_HOST_ARCH).Common
-#  RELEASE.Common.$(T_A)
-#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-#
-# This file is parsed by both GNUmake and an EPICS Perl script,
-# so it may ONLY contain definititions of paths to other support
-# modules, variable definitions that are used in module paths,
-# and include statements that pull in other RELEASE files.
-# Variables may be used before their values have been set.
-# Build variables that are NOT used in paths should be set in
-# the CONFIG_SITE file.
-
-# Variables and paths to dependent modules:
-#MODULES = /path/to/modules
-#MYMODULE = $(MODULES)/my-module
-
-# If building the EPICS modules individually, set these:
-#EPICS_CA = $(MODULES)/ca-4.13.1
-#EPICS_LIBCOM = $(MODULES)/libcom-3.17.0
-#EPICS_BASE = $(MODULES)/core-7.0.1
-
-# Set RULES here if you want to use build rules from elsewhere:
-#RULES = $(MODULES)/build-rules
-
-# These lines allow developers to override these RELEASE settings
-# without having to modify this file directly.
--include $(TOP)/../RELEASE.local
--include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
--include $(TOP)/configure/RELEASE.local
diff --git a/modules/database/configure/RULES b/modules/database/configure/RULES
 deleted file mode 100644
index 6d56e14..0000000
--- a/modules/database/configure/RULES
+++ /dev/null
@@ -1,6 +0,0 @@
-# RULES
-
-include $(CONFIG)/RULES
-
-# Library should be rebuilt because LIBOBJS may have changed.
-$(LIBNAME): ../Makefile
diff --git a/modules/database/configure/RULES.ioc b/modules/database/configure/RULES.ioc
 deleted file mode 100644
index 901987c..0000000
--- a/modules/database/configure/RULES.ioc
+++ /dev/null
@@ -1,2 +0,0 @@
-#RULES.ioc
-include $(CONFIG)/RULES.ioc
diff --git a/modules/database/configure/RULES_DIRS b/modules/database/configure/RULES_DIRS
 deleted file mode 100644
index 3ba269d..0000000
--- a/modules/database/configure/RULES_DIRS
+++ /dev/null
@@ -1,2 +0,0 @@
-#RULES_DIRS
-include $(CONFIG)/RULES_DIRS
diff --git a/modules/database/configure/RULES_TOP b/modules/database/configure/RULES_TOP
 deleted file mode 100644
index 2b8cbc6..0000000
--- a/modules/database/configure/RULES_TOP
+++ /dev/null
@@ -1,2 +0,0 @@
-#RULES_TOP
-include $(CONFIG)/RULES_TOP
diff --git a/modules/database/src/Makefile b/modules/database/src/Makefile
index dfd1d3b..0cc46fa 100644
--- a/modules/database/src/Makefile
+++ b/modules/database/src/Makefile
@@ -7,7 +7,7 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ..
+TOP = ../../..
 include $(TOP)/configure/CONFIG
 
 # PDB Tools
diff --git a/modules/database/src/ioc/Makefile b/modules/database/src/ioc/Makefile
index 3258728..9ff0040 100644
--- a/modules/database/src/ioc/Makefile
+++ b/modules/database/src/ioc/Makefile
@@ -6,12 +6,14 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
-TOP=../..
+IOCDIR := $(or $(dir $(lastword $(MAKEFILE_LIST))), .)
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
-SRC = $(TOP)/src
-IOCDIR = $(SRC)/ioc
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
+SHRLIB_VERSION = 3.17.0
 
 LIBRARY_IOC += dbCore
 dbCore_LIBS += ca Com
diff --git a/modules/database/src/std/Makefile b/modules/database/src/std/Makefile
index 20a8658..2434bf0 100644
--- a/modules/database/src/std/Makefile
+++ b/modules/database/src/std/Makefile
@@ -6,11 +6,13 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
-
-TOP = ../..
+STDDIR := $(or $(dir $(lastword $(MAKEFILE_LIST))), .)
+TOP = ../../../..
 include $(TOP)/configure/CONFIG
 
-STDDIR=$(TOP)/src/std
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
+SHRLIB_VERSION = 3.17.0
 
 LIBRARY_IOC += dbRecStd
 dbRecStd_LIBS = dbCore ca Com
diff --git a/modules/database/src/template/Makefile b/modules/database/src/template/Makefile
index 6259b6f..8dfc6c6 100644
--- a/modules/database/src/template/Makefile
+++ b/modules/database/src/template/Makefile
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
diff --git a/modules/database/src/tools/Makefile b/modules/database/src/tools/Makefile
index e19c0c5..f54ab9c 100644
--- a/modules/database/src/tools/Makefile
+++ b/modules/database/src/tools/Makefile
@@ -4,7 +4,7 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
-TOP=../..
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
@@ -27,8 +27,6 @@ PERL_MODULES += DBD/Variable.pm
 PERL_MODULES += EPICS/IOC.pm
 HTMLS += EPICS/IOC.html
 
-PERL_SCRIPTS += databaseModuleDirs.pm
-
 PERL_SCRIPTS += makeIncludeDbd.pl
 
 PERL_SCRIPTS += dbdToMenuH.pl
diff --git a/modules/database/src/tools/dbExpand.pl b/modules/database/src/tools/dbExpand.pl
index 25cab26..6596e43 100644
--- a/modules/database/src/tools/dbExpand.pl
+++ b/modules/database/src/tools/dbExpand.pl
@@ -12,9 +12,7 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use databaseModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use DBD;
 use DBD::Parser;
diff --git a/modules/database/src/tools/dbdExpand.pl b/modules/database/src/tools/dbdExpand.pl
index a87ef47..74e81eb 100644
--- a/modules/database/src/tools/dbdExpand.pl
+++ b/modules/database/src/tools/dbdExpand.pl
@@ -10,9 +10,7 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use databaseModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use DBD;
 use DBD::Parser;
diff --git a/modules/database/src/tools/dbdReport.pl b/modules/database/src/tools/dbdReport.pl
index 0d4c854..3f2269d 100644
--- a/modules/database/src/tools/dbdReport.pl
+++ b/modules/database/src/tools/dbdReport.pl
@@ -8,9 +8,7 @@
 #*************************************************************************
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use databaseModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use DBD;
 use DBD::Parser;
diff --git a/modules/database/src/tools/dbdToHtml.pl b/modules/database/src/tools/dbdToHtml.pl
index e9711f7..66d46f9 100644
--- a/modules/database/src/tools/dbdToHtml.pl
+++ b/modules/database/src/tools/dbdToHtml.pl
@@ -10,9 +10,7 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use databaseModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use DBD;
 use DBD::Parser;
diff --git a/modules/database/src/tools/dbdToMenuH.pl b/modules/database/src/tools/dbdToMenuH.pl
index ac4345b..76aff7d 100644
--- a/modules/database/src/tools/dbdToMenuH.pl
+++ b/modules/database/src/tools/dbdToMenuH.pl
@@ -8,9 +8,7 @@
 #*************************************************************************
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use databaseModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use EPICS::Getopts;
 use File::Basename;
diff --git a/modules/database/src/tools/dbdToRecordtypeH.pl b/modules/database/src/tools/dbdToRecordtypeH.pl
index b1eb77d..891b5b5 100644
--- a/modules/database/src/tools/dbdToRecordtypeH.pl
+++ b/modules/database/src/tools/dbdToRecordtypeH.pl
@@ -8,9 +8,7 @@
 #*************************************************************************
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use databaseModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use EPICS::Getopts;
 use File::Basename;
diff --git a/modules/database/src/tools/registerRecordDeviceDriver.pl b/modules/database/src/tools/registerRecordDeviceDriver.pl
index 02bb9b7..acbcc51 100644
--- a/modules/database/src/tools/registerRecordDeviceDriver.pl
+++ b/modules/database/src/tools/registerRecordDeviceDriver.pl
@@ -12,9 +12,7 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use databaseModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use DBD;
 use DBD::Parser;
diff --git a/modules/database/test/Makefile b/modules/database/test/Makefile
index 0f2c642..b54d017 100644
--- a/modules/database/test/Makefile
+++ b/modules/database/test/Makefile
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ..
+TOP = ../../..
 include $(TOP)/configure/CONFIG
 
 DIRS += ioc/db
diff --git a/modules/database/test/ioc/db/Makefile b/modules/database/test/ioc/db/Makefile
index e1f06cd..ee2ab76 100644
--- a/modules/database/test/ioc/db/Makefile
+++ b/modules/database/test/ioc/db/Makefile
@@ -6,12 +6,13 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
-
-TOP = ../../..
+CURDIR := $(or $(dir $(lastword $(MAKEFILE_LIST))), .)
+TOP = ../../../../..
 include $(TOP)/configure/CONFIG
 
 # Allow access to private headers in db/
-USR_CPPFLAGS = -I $(TOP)/src/ioc/db
+USR_CPPFLAGS += -I $(CURDIR)/../../../src/ioc/db
+USR_CPPFLAGS += -DUSE_TYPED_RSET
 
 TESTLIBRARY = dbTestIoc
 
diff --git a/modules/database/test/ioc/dbtemplate/Makefile b/modules/database/test/ioc/dbtemplate/Makefile
index 4442a4f..dbb13f3 100644
--- a/modules/database/test/ioc/dbtemplate/Makefile
+++ b/modules/database/test/ioc/dbtemplate/Makefile
@@ -5,7 +5,7 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ../../..
+TOP = ../../../../..
 
 include $(TOP)/configure/CONFIG
 
diff --git a/modules/database/test/std/filters/Makefile b/modules/database/test/std/filters/Makefile
index 718b8d5..c95e108 100644
--- a/modules/database/test/std/filters/Makefile
+++ b/modules/database/test/std/filters/Makefile
@@ -7,10 +7,12 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ../../..
+TOP = ../../../../..
 
 include $(TOP)/configure/CONFIG
 
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
 TESTLIBRARY = Recs
 
 Recs_SRCS += xRecord.c
diff --git a/modules/database/test/std/link/Makefile b/modules/database/test/std/link/Makefile
index 8540cdf..2563fd5 100644
--- a/modules/database/test/std/link/Makefile
+++ b/modules/database/test/std/link/Makefile
@@ -4,10 +4,12 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
-TOP=../../..
+TOP=../../../../..
 
 include $(TOP)/configure/CONFIG
 
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
 TESTLIBRARY = Recs
 
 Recs_SRCS += ioRecord.c
diff --git a/modules/database/test/std/rec/Makefile b/modules/database/test/std/rec/Makefile
index 185c2c0..8720875 100644
--- a/modules/database/test/std/rec/Makefile
+++ b/modules/database/test/std/rec/Makefile
@@ -7,9 +7,11 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ../../..
+TOP = ../../../../..
 include $(TOP)/configure/CONFIG
 
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
 TESTLIBRARY = dbRecStdTest
 
 dbRecStdTest_SRCS += asTestLib.c
diff --git a/modules/database/test/tools/Makefile b/modules/database/test/tools/Makefile
index ac7f420..2dd045e 100644
--- a/modules/database/test/tools/Makefile
+++ b/modules/database/test/tools/Makefile
@@ -5,7 +5,7 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ../..
+TOP = ../../../..
 include $(TOP)/configure/CONFIG
 
 
diff --git a/modules/libcom/.ci/travis-build.sh b/modules/libcom/.ci/travis-build.sh
 deleted file mode 100755
index 622979b..0000000
--- a/modules/libcom/.ci/travis-build.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e -x
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 $EXTRA
-
-if [ "$TEST" != "NO" ]
-then
-  make -j2 tapfiles
-  make -s test-results
-fi
diff --git a/modules/libcom/.ci/travis-prepare.sh b/modules/libcom/.ci/travis-prepare.sh
 deleted file mode 100755
index 9a4d237..0000000
--- a/modules/libcom/.ci/travis-prepare.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-set -e -x
-
-CURDIR="$PWD"
-
-QDIR="$HOME/.cache/qemu"
-
-if [ -n "$RTEMS" -a "$TEST" = "YES" ]
-then
-  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
-  cd "$HOME/.build/qemu"
-
-  HEAD=`git log -n1 --pretty=format:%H`
-  echo "HEAD revision $HEAD"
-
-  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
-  echo "Cached revision $BUILT"
-
-  if [ "$HEAD" != "$BUILT" ]
-  then
-    echo "Building QEMU"
-    git submodule --quiet update --init
-
-    install -d "$HOME/.build/qemu/build"
-    cd         "$HOME/.build/qemu/build"
-
-    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
-    make -j2
-    make install
-
-    echo "$HEAD" > "$HOME/.cache/qemu/built"
-  fi
-fi
-
-cd "$CURDIR"
-
-cat << EOF > configure/RELEASE.local
-EPICS_BASE=$HOME/.source/epics-base
-EOF
-
-install -d "$HOME/.source"
-cd "$HOME/.source"
-
-git clone --quiet --depth 5 --branch core/"${BRCORE:-master}" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
-(cd epics-base && git log -n1 )
-
-EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
-
-# requires wine and g++-mingw-w64-i686
-if [ "$WINE" = "32" ]
-then
-  echo "Cross mingw32"
-  sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-CMPLR_PREFIX=i686-w64-mingw32-
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
-EOF
-fi
-
-if [ "$STATIC" = "YES" ]
-then
-  echo "Build static libraries/executables"
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-SHARED_LIBRARIES=NO
-STATIC_BUILD=YES
-EOF
-fi
-
-case "$CMPLR" in
-clang)
-  echo "Host compiler is clang"
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++
-EOF
-
-  # hack
-  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
-
-  clang --version
-  ;;
-*)
-  echo "Host compiler is default"
-  gcc --version
-  ;;
-esac
-
-cat <<EOF >> epics-base/configure/CONFIG_SITE
-USR_CPPFLAGS += $USR_CPPFLAGS
-USR_CFLAGS += $USR_CFLAGS
-USR_CXXFLAGS += $USR_CXXFLAGS
-EOF
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  echo "Cross RTEMS${RTEMS} for pc386"
-  install -d /home/travis/.cache
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
-  | tar -C /home/travis/.cache -xj
-
-  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-RTEMS_VERSION=$RTEMS
-RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
-EOF
-
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 -C epics-base $EXTRA
diff --git a/modules/libcom/.travis.yml b/modules/libcom/.travis.yml
 deleted file mode 100644
index 8b1e2ab..0000000
--- a/modules/libcom/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-sudo: false
-dist: trusty
-language: c
-compiler:
-  - gcc
-addons:
-  apt:
-    packages:
-    - libreadline6-dev
-    - libncurses5-dev
-    - perl
-    - clang
-    - g++-mingw-w64-i686
-install:
- - ./.ci/travis-prepare.sh
-script:
- - ./.ci/travis-build.sh
-env:
- - BRCORE=master
- - CMPLR=clang
- - USR_CXXFLAGS=-std=c++11
- - CMPLR=clang USR_CXXFLAGS=-std=c++11
- - WINE=32 TEST=NO STATIC=YES
- - WINE=32 TEST=NO STATIC=NO
- - RTEMS=4.10 TEST=NO
- - RTEMS=4.9 TEST=NO
diff --git a/modules/libcom/Makefile b/modules/libcom/Makefile
index 442a6f7..5a03a43 100644
--- a/modules/libcom/Makefile
+++ b/modules/libcom/Makefile
@@ -7,11 +7,10 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = .
+TOP = ../..
 include $(TOP)/configure/CONFIG
 
-DIRS += configure src
-src_DEPEND_DIRS = configure
+DIRS += src
 
 DIRS += RTEMS
 RTEMS_DEPEND_DIRS = src
@@ -22,4 +21,4 @@ vxWorks_DEPEND_DIRS = src
 DIRS += test
 test_DEPEND_DIRS = RTEMS vxWorks
 
-include $(TOP)/configure/RULES_TOP
+include $(TOP)/configure/RULES_DIRS
diff --git a/modules/libcom/RTEMS/Makefile b/modules/libcom/RTEMS/Makefile
index 311c250..b46889d 100644
--- a/modules/libcom/RTEMS/Makefile
+++ b/modules/libcom/RTEMS/Makefile
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ..
+TOP = ../../..
 include $(TOP)/configure/CONFIG
 include $(TOP)/configure/CONFIG_LIBCOM_VERSION
 
diff --git a/modules/libcom/configure/CONFIG b/modules/libcom/configure/CONFIG
 deleted file mode 100644
index 774ed25..0000000
--- a/modules/libcom/configure/CONFIG
+++ /dev/null
@@ -1,44 +0,0 @@
-# CONFIG - Load build configuration data
-#
-# Do not make changes to this file!
-
-ifeq ($(strip $(EPICS_HOST_ARCH)),)
-  $(warning EPICS_HOST_ARCH is not set.)
-endif
-
-# Allow user to override where the build rules come from
-RULES = $(EPICS_BASE)
-
-# RELEASE files point to other application tops
-include $(TOP)/configure/RELEASE
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
-ifdef T_A
--include $(TOP)/configure/RELEASE.Common.$(T_A)
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-endif
-
-ifeq ($(strip $(RULES)),)
-  ifeq ($(strip $(EPICS_BASE)),)
-    $(warning Build error: EPICS_BASE not set after including RELEASE files.)
-  else
-    $(warning Build error: EPICS_BASE set but RULES variable empty.)
-  endif
-  $(error Makefiles loaded: $(MAKEFILE_LIST))
-  # Die before the include of $(CONFIG)/CONFIG below does
-endif
-
-BUILDING_LIBCOM = DEFINED
-
-CONFIG = $(RULES)/configure
-include $(CONFIG)/CONFIG
-
-# Override the Base definition:
-INSTALL_LOCATION = $(TOP)
-
-# CONFIG_SITE files contain other build configuration settings
-include $(TOP)/configure/CONFIG_SITE
--include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-ifdef T_A
- -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
- -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-endif
diff --git a/modules/libcom/configure/CONFIG_SITE b/modules/libcom/configure/CONFIG_SITE
 deleted file mode 100644
index d78c7f5..0000000
--- a/modules/libcom/configure/CONFIG_SITE
+++ /dev/null
@@ -1,42 +0,0 @@
-# CONFIG_SITE
-
-# Make any application-specific changes to the EPICS build
-#   configuration variables in this file.
-#
-# Host/target specific settings can be specified in files named
-#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-#   CONFIG_SITE.Common.$(T_A)
-#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
-# CHECK_RELEASE controls the consistency checking of the support
-#   applications pointed to by the RELEASE* files.
-# Normally CHECK_RELEASE should be set to YES.
-# Set CHECK_RELEASE to NO to disable checking completely.
-# Set CHECK_RELEASE to WARN to perform consistency checking but
-#   continue building even if conflicts are found.
-CHECK_RELEASE = YES
-
-# Set this when you only want to compile this application
-#   for a subset of the cross-compiled target architectures
-#   that Base is built for.
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
-
-# To install files into a location other than $(TOP) define
-#   INSTALL_LOCATION here.
-#INSTALL_LOCATION=</absolute/path/to/install/top>
-
-# Set this when the IOC and build host use different paths
-#   to the install location. This may be needed to boot from
-#   a Microsoft FTP server say, or on some NFS configurations.
-#IOCS_APPL_TOP = </IOC's/absolute/path/to/install/top>
-
-# For application debugging purposes, override the HOST_OPT and/
-#   or CROSS_OPT settings from base/configure/CONFIG_SITE
-#HOST_OPT = NO
-#CROSS_OPT = NO
-
-# These allow developers to override the CONFIG_SITE variable
-# settings without having to modify the configure/CONFIG_SITE
-# file itself.
--include $(TOP)/../CONFIG_SITE.local
--include $(TOP)/configure/CONFIG_SITE.local
diff --git a/modules/libcom/configure/Makefile b/modules/libcom/configure/Makefile
 deleted file mode 100644
index 85a7b58..0000000
--- a/modules/libcom/configure/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#*************************************************************************
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP = ..
-
-include $(TOP)/configure/CONFIG
-
-TARGETS = $(CONFIG_TARGETS)
-CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
-
-CFG += CONFIG_LIBCOM_MODULE
-CFG += CONFIG_LIBCOM_VERSION
-
-include $(TOP)/configure/RULES
diff --git a/modules/libcom/configure/RELEASE b/modules/libcom/configure/RELEASE
 deleted file mode 100644
index 819b441..0000000
--- a/modules/libcom/configure/RELEASE
+++ /dev/null
@@ -1,38 +0,0 @@
-# RELEASE - Location of external support modules
-#
-# IF YOU CHANGE ANY PATHS in this file or make API changes to
-# any modules it refers to, you should do a "make rebuild" in
-# this application's top level directory.
-#
-# The EPICS build process does not check dependencies against
-# any files from outside the application, so it is safest to
-# rebuild it completely if any modules it depends on change.
-#
-# Host- or target-specific settings can be given in files named
-#  RELEASE.$(EPICS_HOST_ARCH).Common
-#  RELEASE.Common.$(T_A)
-#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-#
-# This file is parsed by both GNUmake and an EPICS Perl script,
-# so it may ONLY contain definititions of paths to other support
-# modules, variable definitions that are used in module paths,
-# and include statements that pull in other RELEASE files.
-# Variables may be used before their values have been set.
-# Build variables that are NOT used in paths should be set in
-# the CONFIG_SITE file.
-
-# Variables and paths to dependent modules:
-#MODULES = /path/to/modules
-#MYMODULE = $(MODULES)/my-module
-
-# If building the EPICS modules individually, set these:
-#EPICS_BASE = $(MODULES)/core-7.0.1
-
-# Set RULES here if you want to use build rules from elsewhere:
-#RULES = $(MODULES)/build-rules
-
-# These lines allow developers to override these RELEASE settings
-# without having to modify this file directly.
--include $(TOP)/../RELEASE.local
--include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
--include $(TOP)/configure/RELEASE.local
diff --git a/modules/libcom/configure/RULES b/modules/libcom/configure/RULES
 deleted file mode 100644
index 6d56e14..0000000
--- a/modules/libcom/configure/RULES
+++ /dev/null
@@ -1,6 +0,0 @@
-# RULES
-
-include $(CONFIG)/RULES
-
-# Library should be rebuilt because LIBOBJS may have changed.
-$(LIBNAME): ../Makefile
diff --git a/modules/libcom/configure/RULES_DIRS b/modules/libcom/configure/RULES_DIRS
 deleted file mode 100644
index 3ba269d..0000000
--- a/modules/libcom/configure/RULES_DIRS
+++ /dev/null
@@ -1,2 +0,0 @@
-#RULES_DIRS
-include $(CONFIG)/RULES_DIRS
diff --git a/modules/libcom/configure/RULES_TOP b/modules/libcom/configure/RULES_TOP
 deleted file mode 100644
index 2b8cbc6..0000000
--- a/modules/libcom/configure/RULES_TOP
+++ /dev/null
@@ -1,2 +0,0 @@
-#RULES_TOP
-include $(CONFIG)/RULES_TOP
diff --git a/modules/libcom/src/Makefile b/modules/libcom/src/Makefile
index d61b268..4a1c61e 100644
--- a/modules/libcom/src/Makefile
+++ b/modules/libcom/src/Makefile
@@ -6,15 +6,13 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
-
-TOP = ..
+LIBCOM := $(or $(dir $(lastword $(MAKEFILE_LIST))), .)
+TOP = ../../..
 include $(TOP)/configure/CONFIG
 
 # Uncomment this to remove the (benign) valgrind helper stubs
 #USR_CFLAGS += -DNVALGRIND
 
-LIBCOM = $(TOP)/src
-
 INC += valgrind/valgrind.h
 
 INC += libComVersion.h
diff --git a/modules/libcom/src/env/Makefile b/modules/libcom/src/env/Makefile
index 804426b..94322a2 100644
--- a/modules/libcom/src/env/Makefile
+++ b/modules/libcom/src/env/Makefile
@@ -12,7 +12,6 @@ SRC_DIRS += $(LIBCOM)/env
 vpath %.pl $(USR_VPATH) $(SRC_DIRS)
 
 PERL_SCRIPTS += bldEnvData.pl
-PERL_SCRIPTS += libcomModuleDirs.pm
 
 INC += envDefs.h
 
diff --git a/modules/libcom/src/env/RULES b/modules/libcom/src/env/RULES
index 02df6aa..5ef766d 100644
--- a/modules/libcom/src/env/RULES
+++ b/modules/libcom/src/env/RULES
@@ -8,7 +8,7 @@
 # This is a Makefile fragment, see src/libCom/Makefile.
 
 envData.c: $(LIBCOM)/env/envDefs.h \
-    $(INSTALL_HOST_BIN)/bldEnvData.pl $(INSTALL_HOST_BIN)/libcomModuleDirs.pm \
+    $(INSTALL_HOST_BIN)/bldEnvData.pl \
     $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV \
     $(wildcard $(CONFIG)/os/CONFIG_SITE_ENV.$(T_A))
 	$(PERL) $(INSTALL_HOST_BIN)/bldEnvData.pl $(QUIET_FLAG) -t $(T_A) \
diff --git a/modules/libcom/src/env/bldEnvData.pl b/modules/libcom/src/env/bldEnvData.pl
index e3c21b7..693be65 100644
--- a/modules/libcom/src/env/bldEnvData.pl
+++ b/modules/libcom/src/env/bldEnvData.pl
@@ -14,9 +14,7 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib ($Bin, "$Bin/../../lib/perl");
-use libcomModuleDirs;
-no lib $Bin;
+use lib ("$Bin/../../lib/perl");
 
 use Getopt::Std;
 use File::Basename;
diff --git a/modules/libcom/test/Makefile b/modules/libcom/test/Makefile
index c8680e3..e90c6bc 100755
--- a/modules/libcom/test/Makefile
+++ b/modules/libcom/test/Makefile
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ..
+TOP = ../../..
 include $(TOP)/configure/CONFIG
 
 PROD_LIBS += Com
diff --git a/modules/libcom/vxWorks/Makefile b/modules/libcom/vxWorks/Makefile
index e2c0b5d..3eced3b 100644
--- a/modules/libcom/vxWorks/Makefile
+++ b/modules/libcom/vxWorks/Makefile
@@ -5,7 +5,7 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ..
+TOP = ../../..
 include $(TOP)/configure/CONFIG
 
 # Install Boost smart_ptr headers needed by VxWorks 6.x
diff --git a/src/template/base/makeBaseApp.pl b/src/template/base/makeBaseApp.pl
index d6da8ad..0421f00 100644
--- a/src/template/base/makeBaseApp.pl
+++ b/src/template/base/makeBaseApp.pl
@@ -3,7 +3,7 @@
 # Authors: Ralph Lange, Marty Kraimer, Andrew Johnson and Janet Anderson
 
 use FindBin qw($Bin);
-use lib ("$Bin/../../lib/perl", $Bin);
+use lib ("$Bin/../../lib/perl");
 
 use Cwd;
 use Getopt::Std;
diff --git a/src/tools/convertRelease.pl b/src/tools/convertRelease.pl
index a5a1a77..2533784 100644
--- a/src/tools/convertRelease.pl
+++ b/src/tools/convertRelease.pl
@@ -19,7 +19,7 @@ use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
 
 use FindBin qw($Bin);
-use lib ("$Bin/../../lib/perl", $Bin);
+use lib ("$Bin/../../lib/perl");
 
 use EPICS::Path;
 use EPICS::Release;
diff --git a/src/tools/expandVars.pl b/src/tools/expandVars.pl
index 01e65fb..855aca3 100644
--- a/src/tools/expandVars.pl
+++ b/src/tools/expandVars.pl
@@ -10,7 +10,7 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib ("$Bin/../../lib/perl", $Bin);
+use lib ("$Bin/../../lib/perl");
 
 use EPICS::Getopts;
 use EPICS::Path;
diff --git a/src/tools/fullPathName.pl b/src/tools/fullPathName.pl
index c8ac49a..20ef6d2 100644
--- a/src/tools/fullPathName.pl
+++ b/src/tools/fullPathName.pl
@@ -17,7 +17,7 @@ use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
 
 use FindBin qw($Bin);
-use lib ("$Bin/../../lib/perl", $Bin);
+use lib ("$Bin/../../lib/perl");
 
 use EPICS::Path;