Revert "Bug 1283930 - Add Makefile.PL & local/lib/perl5 support to bmo/master + local symlink to data/ directory"

This reverts commit e6bf4cacb10f86077fe898349485f5c7ab9fb4b6.

4 files changed, 8 insertions, 9 deletions

diff --git a/contrib/clear-memcached.pl b/contrib/clear-memcached.pl
index 31fe3bb00..01202ce7c 100755
--- a/contrib/clear-memcached.pl
+++ b/contrib/clear-memcached.pl
@@ -10,8 +10,9 @@
 use strict;
 use warnings;
 
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use FindBin qw($Bin);
+use lib "$Bin/..";
+use lib "$Bin/../lib";
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/contrib/clear-templates.pl b/contrib/clear-templates.pl
index ba89cb6d5..8b0864d46 100755
--- a/contrib/clear-templates.pl
+++ b/contrib/clear-templates.pl
@@ -9,8 +9,7 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use lib qw(. lib);
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/contrib/fixperms.pl b/contrib/fixperms.pl
index 3246fc06b..406c149cb 100755
--- a/contrib/fixperms.pl
+++ b/contrib/fixperms.pl
@@ -21,8 +21,7 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use lib qw(. lib);
 
 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 f0d18f509..768053126 100755
--- a/contrib/nagios_blocker_checker.pl
+++ b/contrib/nagios_blocker_checker.pl
@@ -10,9 +10,9 @@
 use strict;
 use warnings;
 
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
-
+use FindBin qw($Bin);
+use lib "$Bin/..";
+use lib "$Bin/../lib";
 
 use Bugzilla;
 use Bugzilla::Constants;