Perl scripts use perl module for RELEASE dependencies

src/tools/Makefile

@@ -24,6 +24,8 @@ PERL_MODULES += DBD/Record.pm
 PERL_MODULES += DBD/Registrar.pm
 PERL_MODULES += DBD/Variable.pm
 
+PERL_MODULES += databaseModuleDirs.pm
+
 PERL_SCRIPTS += makeIncludeDbd.pl
 
 PERL_SCRIPTS += dbdToMenuH.pl

src/tools/dbdExpand.pl

@@ -11,6 +11,7 @@ use strict;
 
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
+use databaseModuleDirs;
 
 use DBD;
 use DBD::Parser;

src/tools/dbdReport.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 #*************************************************************************
 # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
@@ -9,6 +9,7 @@
 
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
+use databaseModuleDirs;
 
 use DBD;
 use DBD::Parser;

src/tools/dbdToHtml.pl

@@ -1,4 +1,5 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
+
 #*************************************************************************
 # Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
@@ -10,6 +11,7 @@ use strict;
 
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
+use databaseModuleDirs;
 
 use DBD;
 use DBD::Parser;

src/tools/dbdToMenuH.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 #*************************************************************************
 # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
@@ -9,6 +9,7 @@
 
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
+use databaseModuleDirs;
 
 use EPICS::Getopts;
 use File::Basename;

src/tools/dbdToRecordtypeH.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 #*************************************************************************
 # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
@@ -9,6 +9,7 @@
 
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
+use databaseModuleDirs;
 
 use EPICS::Getopts;
 use File::Basename;

src/tools/makeIncludeDbd.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+
 #*************************************************************************
 # Copyright (c) 2014 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.

src/tools/registerRecordDeviceDriver.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+
 #*************************************************************************
 # Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
@@ -12,6 +13,7 @@ use strict;
 
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
+use databaseModuleDirs;
 
 use DBD;
 use DBD::Parser;

test/tools/Breaktable.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 9;
 

test/tools/DBD.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 18;
 

test/tools/Device.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 16;
 

test/tools/Driver.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 2;
 

test/tools/Function.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 2;
 

test/tools/Makefile

@@ -23,3 +23,6 @@ TESTS += Variable
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
 
 include $(TOP)/configure/RULES
+
+# Create local copy else out-of-tree installs break the scripts
+$(TESTSCRIPTS_HOST) : $(COMMON_DIR)/databaseModuleDirs.pm

test/tools/Menu.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 14;
 

test/tools/Recfield.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 76;
 

test/tools/Recordtype.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 17;
 

test/tools/Registrar.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 2;
 

test/tools/Variable.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 4;
 

test/tools/macLib.plt

@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-use lib '../..';
+use lib '../O.Common';
+use databaseModuleDirs;
 
 use Test::More tests => 35;