From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 2 May 2017 20:49:52 +0000 (+0200)
Subject: termcol: move generated xcolors include to data/
X-Git-Tag: v1.10~23
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/a3f9b6de6bde0cd3f32faee7e4c982f6e7d42aaf?ds=sidebyside

termcol: move generated xcolors include to data/
---

diff --git a/Makefile b/Makefile
index 6e60635..7727514 100644
--- 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 3411852..3c3b365 100644
--- 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';
 	},