Merge branch 'master' of git://git.ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / transient.pm

diff --git a/IkiWiki/Plugin/transient.pm b/IkiWiki/Plugin/transient.pm
index c482b8552f78efbe218b71de14bf21cf97a6cd2c..c0ad5fc11476ef4442cb64e81c7f5580e3795942 100644 (file)
--- a/IkiWiki/Plugin/transient.pm
+++ b/IkiWiki/Plugin/transient.pm
@@ -25,10 +25,12 @@ sub getsetup () {
 our $transientdir;
 
 sub checkconfig () {
-       eval q{use Cwd 'abs_path'};
-       error($@) if $@;
-       $transientdir = abs_path($config{wikistatedir})."/transient";
-       add_underlay($transientdir);
+       if (defined $config{wikistatedir}) {
+               $transientdir = $config{wikistatedir}."/transient";
+               # add_underlay treats relative underlays as relative to the installed
+               # location, not the cwd. That's not what we want here.
+               IkiWiki::add_literal_underlay($transientdir);
+       }
 }
 
 sub change (@) {