X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/741b4dc4751773841d6b586cd791da8f1a69d058..0ecd498b120e427bd58940919ef05cb8c653ad68:/tools/mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index de0bbf1..e7cd4f5 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -13,9 +13,13 @@ my @fontlist;
 
 my %cover;
 my $incsuffix = '.inc.pl';
-for my $fontfile (glob 'ttfsupport/*'.$incsuffix) {
+for my $fontfile (glob 'data/font/*'.$incsuffix) {
 	my ($fontid) = basename($fontfile, $incsuffix);
-	my ($fontmeta, @fontrange) = do $fontfile or next;
+	my ($fontmeta, @fontrange) = do "./$fontfile";
+	if (!$fontmeta) {
+		warn "$fontfile: $!";
+		next;
+	}
 	$fontmeta->{file} = $fontid;
 	my $year = substr $fontmeta->{date}, 0, 4;
 	$fontmeta->{description} = join(' ',
@@ -31,7 +35,7 @@ my %charlist;
 
 $charlist{table}->{abc} = ['A'..'Z', 'a'..'z'];
 
-my $chartables = do 'unicode-table.inc.pl' or warn $@ || $!;
+my $chartables = do './unicode-table.inc.pl' or warn $@ || $!;
 if ($chartables) {
 	while (my ($tablegroup, $grouprow) = each %{$chartables}) {
 		while (my ($tablename, $chars) = each %{$grouprow}) {
@@ -65,7 +69,7 @@ eval {
 } or warn "Could not include count for html entities: $@";
 
 eval {
-	my $agemap = do 'unicode-age.inc.pl'
+	my $agemap = do './data/unicode-age.inc.pl'
 		or warn "Could not include unicode version data: $!";
 
 	use Unicode::UCD 'charinfo';