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 /IkiWiki.pm | |
parent | 347a756e384ec6994d4fe7ffe82e384bb9a63057 (diff) | |
download | ikiwiki-f4d99ac1ca03121255e545df89e7d841a02cc0bf.tar ikiwiki-f4d99ac1ca03121255e545df89e7d841a02cc0bf.tar.gz |
* 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 'IkiWiki.pm')
-rw-r--r-- | IkiWiki.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 5ebec5d0b..b6e160ab6 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -15,6 +15,8 @@ memoize("pagespec_translate"); use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase %renderedfiles %pagesources %depends %hooks %forcerebuild}; +my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE + sub defaultconfig () { #{{{ wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$)}, wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/, @@ -44,8 +46,8 @@ sub defaultconfig () { #{{{ srcdir => undef, destdir => undef, pingurl => [], - templatedir => "/usr/share/ikiwiki/templates", - underlaydir => "/usr/share/ikiwiki/basewiki", + templatedir => "$installdir/share/ikiwiki/templates", + underlaydir => "$installdir/share/ikiwiki/basewiki", setup => undef, adminuser => undef, adminemail => undef, |