patch fron Branden to install the man page in Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index f3daaed2fe51ab07cb578f7e9ddb5c5694e68f49..9d31dcb8b56dd1a7c49f7a7b24fd7ccfa72f6f2c 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -26,6 +26,9 @@ extra_install:
 
        install -d $(PREFIX)/share/ikiwiki/basewiki
        cp -a basewiki/* $(PREFIX)/share/ikiwiki/basewiki
 
        install -d $(PREFIX)/share/ikiwiki/basewiki
        cp -a basewiki/* $(PREFIX)/share/ikiwiki/basewiki

+
+       install -d $(PREFIX)/share/man/man1
+       install ikiwiki.man $(PREFIX)/share/man/man1/ikiwiki.1

 }
 }
 
 }
 }
 

diff --git a/debian/rules b/debian/rules
index f64efb776a21334d82dffccdefda1000ab78941f..74206370b1c65ee107adfe4f2c85b881fc099788 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,6 @@ binary-indep: build
        dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL
        dh_link usr/share/ikiwiki/basewiki \
                usr/share/doc/ikiwiki/examples/basewiki
        dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL
        dh_link usr/share/ikiwiki/basewiki \
                usr/share/doc/ikiwiki/examples/basewiki

-       dh_installman ikiwiki.man

        dh_installchangelogs
        dh_compress -X html
        dh_fixperms
        dh_installchangelogs
        dh_compress -X html
        dh_fixperms

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 2821cea68a1616d1f5caa4f36b7aab302d903980..89c30d56e147ca4ab848ddb2d8c0d3de55541704 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -94,9 +94,13 @@ These options configure the wiki.
 
 * --svn, --nosvn
 
 
 * --svn, --nosvn
 

-  Enable or disable use of [[subversion]]. If subversion is enabled, the `source` directory is assumed to be a working copy, and is automatically updated before building the wiki. 
+  Enable or disable use of [[subversion]]. If subversion is enabled, the
+  `source` directory is assumed to be a working copy, and is automatically
+  updated before building the wiki. 

 
 

-  In [[CGI]] mode, with subversion enabled pages edited via the web will be committed to subversion. Also, the [[RecentChanges]] link will be placed on pages.
+  In [[CGI]] mode, with subversion enabled pages edited via the web will be
+  committed to subversion. Also, the [[RecentChanges]] link will be placed
+  on pages.

 
   Subversion is enabled by default.
 
 
   Subversion is enabled by default.