From f904df2c7f417e3a3daf1b8dc706f10228bde23c Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 7 Dec 2017 11:00:23 -0600
Subject: [PATCH] Install bldEnvData.pl and libcomModuleDirs.pm

Fixes last night's breakage.

Installation is needed so bldEnvData.pl can find libcomModuleDirs.pm
and hence the EPICS::Path and EPICS::Release modules while doing
cross-builds. We'll need it to be installed eventually anyway so
support modules can add their own environment parameters.
---
 src/env/Makefile      | 5 +++++
 src/env/RULES         | 6 +++---
 src/env/bldEnvData.pl | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/env/Makefile b/src/env/Makefile
index 79d67ea19..804426bc0 100644
--- a/src/env/Makefile
+++ b/src/env/Makefile
@@ -9,6 +9,11 @@
 
 SRC_DIRS += $(LIBCOM)/env
 
+vpath %.pl $(USR_VPATH) $(SRC_DIRS)
+
+PERL_SCRIPTS += bldEnvData.pl
+PERL_SCRIPTS += libcomModuleDirs.pm
+
 INC += envDefs.h
 
 Com_SRCS += envSubr.c
diff --git a/src/env/RULES b/src/env/RULES
index f34bc9fe3..1d9a1e7ad 100644
--- a/src/env/RULES
+++ b/src/env/RULES
@@ -7,8 +7,8 @@
 
 # This is a Makefile fragment, see src/libCom/Makefile.
 
-envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \
-    libcomModuleDirs.pm $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV \
+envData.c: $(LIBCOM)/env/envDefs.h $(TOOLS)/bldEnvData.pl \
+    $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV \
     $(wildcard $(CONFIG)/os/CONFIG_SITE_ENV.$(T_A))
-	$(PERL) $(LIBCOM)/env/bldEnvData.pl $(QUIET_FLAG) -t $(T_A) \
+	$(PERL) $(TOOLS)/bldEnvData.pl $(QUIET_FLAG) -t $(T_A) \
 		-c $(CMPLR_CLASS) -s $(OS_CLASS) $(CONFIG)
diff --git a/src/env/bldEnvData.pl b/src/env/bldEnvData.pl
index 306bae128..e3c21b772 100644
--- a/src/env/bldEnvData.pl
+++ b/src/env/bldEnvData.pl
@@ -13,10 +13,10 @@
 
 use strict;
 
-# This program is never installed. It uses lib '.' for the path to
-# libcomModuleDirs.pm which then sets the path to the EPICS modules.
-use lib '.';
+use FindBin qw($Bin);
+use lib ($Bin, "$Bin/../../lib/perl");
 use libcomModuleDirs;
+no lib $Bin;
 
 use Getopt::Std;
 use File::Basename;