tools: fix includes from relative paths for perl v5.26

[sheet.git] / tools / mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index a1cc44d8e1d39365de5eb8b85709da1ab4c80287..e7cd4f53183c6de1cc7654c92de39b4331e0d83c 100755 (executable)
--- 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(' ',
@@ -29,7 +33,9 @@ for my $fontfile (glob 'ttfsupport/*'.$incsuffix) {
 
 my %charlist;
 
-my $chartables = do 'unicode-table.inc.pl' or warn $@ || $!;
+$charlist{table}->{abc} = ['A'..'Z', 'a'..'z'];
+
+my $chartables = do './unicode-table.inc.pl' or warn $@ || $!;
 if ($chartables) {
        while (my ($tablegroup, $grouprow) = each %{$chartables}) {
                while (my ($tablename, $chars) = each %{$grouprow}) {
@@ -63,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';