Bug 1246528 - Use Makefile.PL and allow Bugzilla use cpanm-compatible local dependencies

r=dkl,a=dylan

3 files changed, 14 insertions, 29 deletions

diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst
index a8a790dd7..e1672fc2a 100644
--- a/docs/en/rst/installing/linux.rst
+++ b/docs/en/rst/installing/linux.rst
@@ -149,27 +149,18 @@ times, Bugzilla may require a version of a Perl module newer than the one
 your distribution packages, in which case you will need to install a
 Bugzilla-only copy of the newer version.
 
-At this point you probably need to become ``root``, e.g. by using
-:command:`su`. You should remain as root until the end of the install. This
-can be avoided in some circumstances if you are a member of your webserver's
-group, but being root is easier and will always work.
+To make sure you have all the core requirements to run Bugzilla, you should run the following command:
 
-To check whether you have all the required modules, run:
+:command:`perl Makefile.PL`
 
-:command:`./checksetup.pl --check-modules`
+Should this command warn about missing prerequisites -- or prerequisites that are too old,
+you may use cpanm to install these.
 
-You can run this command as many times as necessary.
+:command:`curl -L http://cpanmin.us | perl - --installdeps -l local .`
 
-If you have not already installed the necessary modules, and want to do it
-system-wide, invoke your package manager appropriately at this point.
-Alternatively, you can install all missing modules locally (i.e. just for
-Bugzilla) like this:
+If you want a more full-featured Bugzilla, use the following command:
 
-:command:`./install-module.pl --all`
-
-Or, you can pass an individual module name:
-
-:command:`./install-module.pl <modulename>`
+:command:`curl -L http://cpanmin.us | perl - --installdeps -l local --with-all-features --without-feature mod_perl --without-feature oracle --without-feature mysql --without-feature pg .`
 
 .. _linux-config-webserver:
 
diff --git a/docs/en/rst/installing/mac-os-x.rst b/docs/en/rst/installing/mac-os-x.rst
index b18a5ec31..938088272 100644
--- a/docs/en/rst/installing/mac-os-x.rst
+++ b/docs/en/rst/installing/mac-os-x.rst
@@ -71,22 +71,16 @@ will need to agree to this.
 Perl Modules
 ============
 
-Bugzilla requires a number of Perl modules. On Mac OS X, the easiest thing to
-do is to install local copies (rather than system-wide copies) of any ones
-that you don't already have. However, if you do want to install them
-system-wide, run the below commands as root with the :command:`--global`
-option.
+Bugzilla requires a number of Perl modules. Generally, the best way to install
+these is with the cpanm command.
 
-To check whether you have all the required modules and what is still missing,
-run:
+Generally, the best way to install these is with cpanm:
 
-:command:`perl checksetup.pl --check-modules`
+:command:`curl -L http://cpanmin.us | perl - --installdeps -l local .`
 
-You can run this command as many times as necessary.
+If you want a more full-featured Bugzilla:
 
-Install all missing modules locally like this:
-
-:command:`perl install-module.pl --all`
+:command:`curl -L http://cpanmin.us | perl - --installdeps -l local --with-all-features --without-feature oracle --without-feature mysql --without-feature pg`
 
 .. _macosx-config-webserver:
 
diff --git a/docs/makedocs.pl b/docs/makedocs.pl
index 26543bebd..6baf9a797 100755
--- a/docs/makedocs.pl
+++ b/docs/makedocs.pl
@@ -30,7 +30,7 @@ use warnings;
 use File::Basename;
 BEGIN { chdir dirname($0); }
 
-use lib qw(.. ../lib lib);
+use lib qw(.. ../lib lib ../local/lib/perl5);
 
 use Cwd;
 use File::Copy::Recursive qw(rcopy);