termcol: move generated xcolors include to data/

diff --git a/Makefile b/Makefile
index 6e606351425dd5e0d20b47de0a4355d87047fc58..7727514789ef458b4c695ca384c04a56d4060f57 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: digraphs.inc.pl unicode-cover.inc.pl countries.inc.pl data/browser termcol-xcolor.inc.pl
+all: digraphs.inc.pl unicode-cover.inc.pl countries.inc.pl data/browser data/termcol-xcolor.inc.pl
 more: all data/digraphs-xorg.inc.pl
 
 download: data/DerivedAge.txt data/rfc1345.txt data/xorg-compose data/countryInfo.txt data/browser/caniuse data/browser/usage-wm.tsv data/xcolors
@@ -42,7 +42,7 @@ data/xcolors:
        [ -r $@/.git ] && cd $@ && git pull --ff-only
        @[ -e $@ ] || git clone https://github.com/tlatsas/xcolors $@
 
-termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes
+data/termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes
        $< $(word 2,$^)/* >$@
 
 .SECONDARY:

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 3411852b135d522ad44e20d73c5c73781b17415a..3c3b365c30ff28f00b4ec3e2038c93a4abf0110e 100644 (file)
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -8,7 +8,7 @@ use Shiar_Sheet::Colour 1.05;
        legacy  => [qw( c64 msx mac2 risc arnegame dawnbringer cpc cpcboy shiar32 ppu shovel 64 )],
 
        xcolors => sub {
-               my $pals = do 'termcol-xcolor.inc.pl' or die $! || $@;
+               my $pals = do 'data/termcol-xcolor.inc.pl' or die $! || $@;
                $_[0]->{$_} = $pals->{$_} for keys %{$pals};
                return 'xcolor';
        },