X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cf3021ef3f5cb839195585d601de76df519da510..513af0c0df210bbab175f3408013f058cec05ef1:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 9556d6ef7..990836f8e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -15,10 +15,11 @@ 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\]]+)\]\]/,
-	wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]*)\]\]/,
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
 	verbose => 0,
 	syslog => 0,
@@ -45,14 +46,15 @@ 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,
 	plugin => [qw{mdwn inline htmlscrubber}],
 	timeformat => '%c',
 	locale => undef,
+	sslcookie => 0,
 } #}}}
    
 sub checkconfig () { #{{{
@@ -545,6 +547,8 @@ sub pagespec_merge ($$) { #{{{
 	my $a=shift;
 	my $b=shift;
 
+	return $a if $a eq $b;
+
         # Support for old-style GlobLists.
         if (is_globlist($a)) {
                 $a=globlist_to_pagespec($a);