From 90de8efd54bc7d075cc0df6f74228da4780bf505 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 6 Dec 2017 21:35:30 -0600
Subject: [PATCH] Don't install libcomModuleDirs.pm

It's only needed by bldEnvData.pl which is never installed.
Make it a dependency so it gets built, and use it from O.<host>
---
 src/Makefile          | 2 --
 src/env/RULES         | 7 +++----
 src/env/bldEnvData.pl | 7 +++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 020df7d5e..13d1409b8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,8 +20,6 @@ INC += valgrind/valgrind.h
 INC += libComVersion.h
 INC += libComVersionNum.h
 
-PERL_MODULES += libcomModuleDirs.pm
-
 include $(LIBCOM)/as/Makefile
 include $(LIBCOM)/bucketLib/Makefile
 include $(LIBCOM)/calc/Makefile
diff --git a/src/env/RULES b/src/env/RULES
index 2e90afcc5..f34bc9fe3 100644
--- a/src/env/RULES
+++ b/src/env/RULES
@@ -2,14 +2,13 @@
 # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 
 # This is a Makefile fragment, see src/libCom/Makefile.
 
 envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \
-	$(COMMON_DIR)/libcomModuleDirs.pm \
-	$(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV \
-	$(wildcard $(CONFIG)/os/CONFIG_SITE_ENV.$(T_A))
+    libcomModuleDirs.pm $(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) \
 		-c $(CMPLR_CLASS) -s $(OS_CLASS) $(CONFIG)
diff --git a/src/env/bldEnvData.pl b/src/env/bldEnvData.pl
index a8bca03b5..306bae128 100644
--- a/src/env/bldEnvData.pl
+++ b/src/env/bldEnvData.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/env perl
-
 #*************************************************************************
 # Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
@@ -14,9 +13,9 @@
 
 use strict;
 
-# This program is never installed, so it can't use FindBin to get
-# the path to the lib/perl directory.
-use lib '../O.Common';
+# 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 libcomModuleDirs;
 
 use Getopt::Std;