updated branch; this is ready for review for inclusion in IkIWiki

[git.ikiwiki.info.git] / doc / install.mdwn

diff --git a/doc/install.mdwn b/doc/install.mdwn
index 82fd299e35c1a26b4a2ef8a63d0bcfaca61deef9..48c11272b0e0ba9fdae6dff7f68a093c4e2212a7 100644 (file)
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -25,7 +25,7 @@ documentation for details.
 
 If you want to install by hand from the tarball, you should make sure that
 all the perl modules are installed. This is one way to install them, using
 
 If you want to install by hand from the tarball, you should make sure that
 all the perl modules are installed. This is one way to install them, using

-CPAN:
+CPAN to install modules from your local machine after you extract the ikiwiki tarball:

 
        PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")'
        PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki::Extras")'
 
        PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")'
        PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki::Extras")'


@@ -34,7 +34,7 @@ CPAN:
 
 Then to build and install ikiwiki:
 
 
 Then to build and install ikiwiki:
 

-       perl Makefile.PL # PREFIX=/dir to install elsewhere
+       perl Makefile.PL # INSTALL_BASE= PREFIX=/dir to install elsewhere

        make
        make test # optional
        make install
        make
        make test # optional
        make install