From d38fcd52473a5c9d43cee891f7d47a526fbe1a99 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 31 Dec 2018 10:31:48 -0800 Subject: [PATCH] no need to search for perl modules under bin/ --- modules/ca/src/perl/capr.pl | 2 +- modules/ca/src/template/top/caPerlApp/caget.pl | 2 +- modules/ca/src/template/top/caPerlApp/cainfo.pl | 2 +- modules/ca/src/template/top/caPerlApp/camonitor.pl | 2 +- modules/ca/src/template/top/caPerlApp/caput.pl | 2 +- modules/database/src/tools/dbExpand.pl | 2 +- modules/database/src/tools/dbdExpand.pl | 2 +- modules/database/src/tools/dbdReport.pl | 2 +- modules/database/src/tools/dbdToHtml.pl | 2 +- modules/database/src/tools/dbdToMenuH.pl | 2 +- modules/database/src/tools/dbdToRecordtypeH.pl | 2 +- modules/database/src/tools/registerRecordDeviceDriver.pl | 2 +- modules/libcom/src/env/bldEnvData.pl | 2 +- src/template/base/makeBaseApp.pl | 2 +- src/tools/convertRelease.pl | 2 +- src/tools/expandVars.pl | 2 +- src/tools/fullPathName.pl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/ca/src/perl/capr.pl b/modules/ca/src/perl/capr.pl index ba5998a14..17a6dd04b 100644 --- a/modules/ca/src/perl/capr.pl +++ b/modules/ca/src/perl/capr.pl @@ -10,7 +10,7 @@ use strict; use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use Getopt::Std; diff --git a/modules/ca/src/template/top/caPerlApp/caget.pl b/modules/ca/src/template/top/caPerlApp/caget.pl index 0d9af37a1..dae3a778a 100644 --- a/modules/ca/src/template/top/caPerlApp/caget.pl +++ b/modules/ca/src/template/top/caPerlApp/caget.pl @@ -4,7 +4,7 @@ use strict; # This construct sets @INC to search lib/perl of all RELEASE entries use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); use _APPNAME_ModuleDirs; no lib $Bin; diff --git a/modules/ca/src/template/top/caPerlApp/cainfo.pl b/modules/ca/src/template/top/caPerlApp/cainfo.pl index 3e38e8baf..37c705e26 100644 --- a/modules/ca/src/template/top/caPerlApp/cainfo.pl +++ b/modules/ca/src/template/top/caPerlApp/cainfo.pl @@ -4,7 +4,7 @@ use strict; # This construct sets @INC to search lib/perl of all RELEASE entries use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); use _APPNAME_ModuleDirs; no lib $Bin; diff --git a/modules/ca/src/template/top/caPerlApp/camonitor.pl b/modules/ca/src/template/top/caPerlApp/camonitor.pl index 564688d68..15c0212f0 100644 --- a/modules/ca/src/template/top/caPerlApp/camonitor.pl +++ b/modules/ca/src/template/top/caPerlApp/camonitor.pl @@ -4,7 +4,7 @@ use strict; # This construct sets @INC to search lib/perl of all RELEASE entries use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); use _APPNAME_ModuleDirs; no lib $Bin; diff --git a/modules/ca/src/template/top/caPerlApp/caput.pl b/modules/ca/src/template/top/caPerlApp/caput.pl index 64ff9cbda..b08c9d200 100644 --- a/modules/ca/src/template/top/caPerlApp/caput.pl +++ b/modules/ca/src/template/top/caPerlApp/caput.pl @@ -4,7 +4,7 @@ use strict; # This construct sets @INC to search lib/perl of all RELEASE entries use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); use _APPNAME_ModuleDirs; no lib $Bin; diff --git a/modules/database/src/tools/dbExpand.pl b/modules/database/src/tools/dbExpand.pl index 35d7750d9..e4088d007 100644 --- a/modules/database/src/tools/dbExpand.pl +++ b/modules/database/src/tools/dbExpand.pl @@ -12,7 +12,7 @@ use strict; use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use DBD; diff --git a/modules/database/src/tools/dbdExpand.pl b/modules/database/src/tools/dbdExpand.pl index 5f12dc23e..7e9ba8b5a 100644 --- a/modules/database/src/tools/dbdExpand.pl +++ b/modules/database/src/tools/dbdExpand.pl @@ -10,7 +10,7 @@ use strict; use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use DBD; diff --git a/modules/database/src/tools/dbdReport.pl b/modules/database/src/tools/dbdReport.pl index adc268345..8a82d690b 100644 --- a/modules/database/src/tools/dbdReport.pl +++ b/modules/database/src/tools/dbdReport.pl @@ -8,7 +8,7 @@ #************************************************************************* use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use DBD; diff --git a/modules/database/src/tools/dbdToHtml.pl b/modules/database/src/tools/dbdToHtml.pl index fa1cc99d7..87fc23230 100644 --- a/modules/database/src/tools/dbdToHtml.pl +++ b/modules/database/src/tools/dbdToHtml.pl @@ -10,7 +10,7 @@ use strict; use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use DBD; diff --git a/modules/database/src/tools/dbdToMenuH.pl b/modules/database/src/tools/dbdToMenuH.pl index 30418a351..e80ae3340 100644 --- a/modules/database/src/tools/dbdToMenuH.pl +++ b/modules/database/src/tools/dbdToMenuH.pl @@ -8,7 +8,7 @@ #************************************************************************* use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use EPICS::Getopts; diff --git a/modules/database/src/tools/dbdToRecordtypeH.pl b/modules/database/src/tools/dbdToRecordtypeH.pl index f1336a147..028309fc4 100644 --- a/modules/database/src/tools/dbdToRecordtypeH.pl +++ b/modules/database/src/tools/dbdToRecordtypeH.pl @@ -8,7 +8,7 @@ #************************************************************************* use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use EPICS::Getopts; diff --git a/modules/database/src/tools/registerRecordDeviceDriver.pl b/modules/database/src/tools/registerRecordDeviceDriver.pl index 671d24051..507385e57 100644 --- a/modules/database/src/tools/registerRecordDeviceDriver.pl +++ b/modules/database/src/tools/registerRecordDeviceDriver.pl @@ -12,7 +12,7 @@ use strict; use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use DBD; diff --git a/modules/libcom/src/env/bldEnvData.pl b/modules/libcom/src/env/bldEnvData.pl index f638c841f..180d63870 100644 --- a/modules/libcom/src/env/bldEnvData.pl +++ b/modules/libcom/src/env/bldEnvData.pl @@ -14,7 +14,7 @@ use strict; use FindBin qw($Bin); -use lib ($Bin, "$Bin/../../lib/perl"); +use lib ("$Bin/../../lib/perl"); no lib $Bin; use Getopt::Std; diff --git a/src/template/base/makeBaseApp.pl b/src/template/base/makeBaseApp.pl index d6da8adf8..0421f004b 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 a5a1a77d8..253378422 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 01e65fb3a..855aca329 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 c8ac49a12..20ef6d231 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;