From: Simon McVittie <smcv@debian.org>
Date: Tue, 9 Dec 2014 19:58:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'spalax/paternal/libdirs'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/23b91e69b02065534e5c57449ec82d7fee9f93e0

Merge remote-tracking branch 'spalax/paternal/libdirs'
---

23b91e69b02065534e5c57449ec82d7fee9f93e0
diff --cc IkiWiki.pm
index 83679243f,9e2eb0b1a..7c55764be
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@@ -550,15 -549,22 +550,29 @@@ sub getsetup () 
  		safe => 0,
  		rebuild => 0,
  	},
 +	responsive_layout => {
 +		type => "boolean",
 +		default => 1,
 +		description => "theme has a responsive layout? (mobile-optimized)",
 +		safe => 1,
 +		rebuild => 1,
 +	},
  }
  
+ sub getlibdirs () {
+ 	my $libdirs;
+ 	if (! ref $config{libdir}) {
+ 		if (length $config{libdir}) {
+ 			$libdirs = [$config{libdir}];
+ 		} else {
+ 			$libdirs = [];
+ 		}
+ 	} else {
+ 		$libdirs = $config{libdir};
+ 	}
+ 	return @{$libdirs};
+ }
+ 
  sub defaultconfig () {
  	my %s=getsetup();
  	my @ret;