Merge remote-tracking branch 'spalax/paternal/libdirs'
authorSimon McVittie <smcv@debian.org>
Tue, 9 Dec 2014 19:58:36 +0000 (19:58 +0000)
committerSimon McVittie <smcv@debian.org>
Tue, 9 Dec 2014 19:58:36 +0000 (19:58 +0000)
1  2 
IkiWiki.pm

diff --cc IkiWiki.pm
index 83679243fe3706a1ec42669df74ceb8ff4733eed,9e2eb0b1a98130bbfc2d7cbb7fd548eda46ad75c..7c55764befa0f5d325e01f302ca4a8a036c82256
@@@ -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;