X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b3e21b043670c946a081d33740cfc2a0eb552c34..02f745a6755e063e921385bbbdcee02469f57269:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 41baa6613..f414996db 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -569,7 +569,10 @@ sub getsetup () {
 }
 
 sub getlibdirs () {
-	my @libdirs = @{$config{libdirs}};
+	my @libdirs;
+	if ($config{libdirs}) {
+		@libdirs = @{$config{libdirs}};
+	}
 	if (length $config{libdir}) {
 		push @libdirs, $config{libdir};
 	}
@@ -616,9 +619,20 @@ sub checkconfig () {
 	if (defined $config{timezone} && length $config{timezone}) {
 		$ENV{TZ}=$config{timezone};
 	}
-	else {
+	elsif (defined $ENV{TZ} && length $ENV{TZ}) {
 		$config{timezone}=$ENV{TZ};
 	}
+	else {
+		eval q{use Config qw()};
+		error($@) if $@;
+
+		if ($Config::Config{d_gnulibc} && -e '/etc/localtime') {
+			$config{timezone}=$ENV{TZ}=':/etc/localtime';
+		}
+		else {
+			$config{timezone}=$ENV{TZ}='GMT';
+		}
+	}
 
 	if ($config{w3mmode}) {
 		eval q{use Cwd q{abs_path}};