diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-25 02:12:43 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-25 02:12:43 +0000 |
| commit | f4d99ac1ca03121255e545df89e7d841a02cc0bf (patch) | |
| tree | bdabb182ecd4fb16e50d1a987de70440ec466349 /doc | |
| parent | 347a756e384ec6994d4fe7ffe82e384bb9a63057 (diff) | |
* Use DESTDIR and not PREFIX to specify installation prefix for packaging.
* Support running "perl Makefile.PL PREFIX=foo" to build ikiwiki to run
from a different directory.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/PREFIX_not_honoured_for_underlaydir.mdwn | 6 | ||||
| -rw-r--r-- | doc/usage.mdwn | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/doc/bugs/PREFIX_not_honoured_for_underlaydir.mdwn b/doc/bugs/PREFIX_not_honoured_for_underlaydir.mdwn index af2ee35cb..e66cad173 100644 --- a/doc/bugs/PREFIX_not_honoured_for_underlaydir.mdwn +++ b/doc/bugs/PREFIX_not_honoured_for_underlaydir.mdwn @@ -41,8 +41,4 @@ isn't entirely clear (perhaps because ordinary Perl modules do not need to be configured at build time depending on the installation directory). It does mention that DESTDIR is the thing used by packaging tools. - It would probably be nice if ikiwiki offered a separate build-time - setting to control where it looked for its data files, though it already - offers a way to do it at runtime (--underlaydir and --templatedir). - - --[[Joey]] + Thanks for clarifying that. [[bugs/done]] --[[Joey]] diff --git a/doc/usage.mdwn b/doc/usage.mdwn index e0c7800d5..daef18c1f 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -91,13 +91,15 @@ configuration options of their own. * --templatedir Specify the directory that the page [[templates]] are stored in. - Default is `/usr/share/ikiwiki/templates`. + Default is `/usr/share/ikiwiki/templates`, or another location as + configured at build time. * --underlaydir Specify the directory that is used to underlay the source directory. Source files will be taken from here unless overridden by a file in the - source directory. Default is `/usr/share/ikiwiki/basewiki`. + source directory. Default is `/usr/share/ikiwiki/basewiki` or another + location as configured at build time. * --wrappermode mode |