summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-04-21 21:40:45 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-04-21 21:40:45 +0000
commit44a74ec022d1ab0fe3fe12fb26b3f2a432dbb2eb (patch)
treeaf9276c5bb80c429fbb1dec17ccf38463e88bd61
parent170a6de6ab040e4d8e173a28d128c4ae07ac4191 (diff)
patch fron Branden to install the man page in Makefile.PL
-rwxr-xr-xMakefile.PL3
-rwxr-xr-xdebian/rules1
-rw-r--r--doc/usage.mdwn8
3 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.PL b/Makefile.PL
index f3daaed2f..9d31dcb8b 100755
--- 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/man/man1
+ install ikiwiki.man $(PREFIX)/share/man/man1/ikiwiki.1
}
}
diff --git a/debian/rules b/debian/rules
index f64efb776..74206370b 100755
--- 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_installman ikiwiki.man
dh_installchangelogs
dh_compress -X html
dh_fixperms
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 2821cea68..89c30d56e 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -94,9 +94,13 @@ These options configure the wiki.
* --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.