diff options
| author | Dylan Hardison <dylan@mozilla.com> | 2016-02-23 22:23:20 +0100 |
|---|---|---|
| committer | Dylan Hardison <dylan@mozilla.com> | 2016-02-23 22:23:20 +0100 |
| commit | 2c33712dc066463ab9741a009e56d9a5c2ffedf6 (patch) | |
| tree | 0be4c1368181648d715a35fd077324d3db0e4dc7 /mod_perl.pl | |
| parent | a8adffb5ba7161a9ac491cca98d880577c1ab2fc (diff) | |
| download | bugzilla-2c33712dc066463ab9741a009e56d9a5c2ffedf6.tar.gz bugzilla-2c33712dc066463ab9741a009e56d9a5c2ffedf6.tar.xz | |
Bug 1246528 - Use Makefile.PL and allow Bugzilla use cpanm-compatible local dependencies
r=dkl,a=dylan
Diffstat (limited to 'mod_perl.pl')
| -rw-r--r-- | mod_perl.pl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mod_perl.pl b/mod_perl.pl index 032266fa2..c61ad4629 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -15,9 +15,14 @@ use warnings; # This sets up our libpath without having to specify it in the mod_perl # configuration. use File::Basename; -use lib dirname(__FILE__); +use File::Spec; +BEGIN { + require lib; + my $dir = dirname(__FILE__); + lib->import($dir, File::Spec->catdir($dir, "lib"), File::Spec->catdir($dir, qw(local lib perl5))); +} + use Bugzilla::Constants (); -use lib Bugzilla::Constants::bz_locations()->{'ext_libpath'}; # If you have an Apache2::Status handler in your Apache configuration, # you need to load Apache2::Status *here*, so that any later-loaded modules |