From 5f310e5b9e7afbd5badb17178349fefaaabfacce Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Thu, 30 Jun 2016 23:32:40 -0400
Subject: Bug 1283930 - Add Makefile.PL & local/lib/perl5 support to bmo/master
 + local symlink to data/ directory

---
 contrib/clear-memcached.pl        | 5 ++---
 contrib/clear-templates.pl        | 3 ++-
 contrib/fixperms.pl               | 3 ++-
 contrib/nagios_blocker_checker.pl | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'contrib')

diff --git a/contrib/clear-memcached.pl b/contrib/clear-memcached.pl
index 01202ce7c..31fe3bb00 100755
--- a/contrib/clear-memcached.pl
+++ b/contrib/clear-memcached.pl
@@ -10,9 +10,8 @@
 use strict;
 use warnings;
 
-use FindBin qw($Bin);
-use lib "$Bin/..";
-use lib "$Bin/../lib";
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/contrib/clear-templates.pl b/contrib/clear-templates.pl
index 8b0864d46..ba89cb6d5 100755
--- a/contrib/clear-templates.pl
+++ b/contrib/clear-templates.pl
@@ -9,7 +9,8 @@
 
 use strict;
 use warnings;
-use lib qw(. lib);
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/contrib/fixperms.pl b/contrib/fixperms.pl
index 406c149cb..3246fc06b 100755
--- a/contrib/fixperms.pl
+++ b/contrib/fixperms.pl
@@ -21,7 +21,8 @@
 
 use strict;
 use warnings;
-use lib qw(. lib);
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Install::Filesystem qw(fix_all_file_permissions);
diff --git a/contrib/nagios_blocker_checker.pl b/contrib/nagios_blocker_checker.pl
index 768053126..f0d18f509 100755
--- a/contrib/nagios_blocker_checker.pl
+++ b/contrib/nagios_blocker_checker.pl
@@ -10,9 +10,9 @@
 use strict;
 use warnings;
 
-use FindBin qw($Bin);
-use lib "$Bin/..";
-use lib "$Bin/../lib";
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+
 
 use Bugzilla;
 use Bugzilla::Constants;
-- 
cgit v1.2.3-24-g4f1b