From ee10014a62e11c31d58ee64e18b22fa6a8bb73dd Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 6 Dec 2017 22:22:26 -0600
Subject: [PATCH] Install caModuleDirs.pm into bin/<host>

Adjust capr.pl to use it from there.
Host arch's may use different absolute paths to the same Base directory,
so they can't share a single copy of that module.
---
 src/perl/Makefile | 2 +-
 src/perl/capr.pl  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/perl/Makefile b/src/perl/Makefile
index 6b31bf8bb..162b243e1 100644
--- a/src/perl/Makefile
+++ b/src/perl/Makefile
@@ -46,7 +46,7 @@ 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_MODULES += caModuleDirs.pm
+  PERL_SCRIPTS += caModuleDirs.pm
 
   HTMLS_DIR = .
   HTMLS = CA.html
diff --git a/src/perl/capr.pl b/src/perl/capr.pl
index 41ae42177..e551afcef 100644
--- a/src/perl/capr.pl
+++ b/src/perl/capr.pl
@@ -10,8 +10,9 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
 use caModuleDirs;
+no lib $Bin;
 
 use Getopt::Std;
 use EPICS::Path;