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

1 files changed, 15 insertions, 21 deletions

diff --git a/email_in.pl b/email_in.pl
index 34e57c90c..0e61bf8f1 100755
--- a/email_in.pl
+++ b/email_in.pl
@@ -1,27 +1,23 @@
-#!/usr/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
+#!/usr/bin/perl -T
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Inbound Email System.
-#
-# The Initial Developer of the Original Code is Akamai Technologies, Inc.
-# Portions created by Akamai are Copyright (C) 2006 Akamai Technologies, 
-# Inc. All Rights Reserved.
-#
-# Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
 use warnings;
 
+use FindBin;
+BEGIN {
+    require lib;
+    my ($bin) = $FindBin::Bin =~ /^(.*)$/;
+
+    lib->import("$bin", "$bin/lib", "$bin/local/lib/perl5");
+}
+
 # MTAs may call this script from any directory, but it should always
 # run from this one so that it can find its modules.
 use Cwd qw(abs_path);
@@ -32,8 +28,6 @@ BEGIN {
     chdir dirname($a);
 }
 
-use lib qw(. lib);
-
 use Data::Dumper;
 use Email::Address;
 use Email::Reply qw(reply);