From d988e32fb994524551bff280a80ab207be1d67b5 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Sun, 22 Aug 2021 08:10:21 +0200 Subject: [PATCH] common: autotools: make awk crlf agnostic when generating svgcolor_lib Fixes errors like this with Cygwin in a crlf environment with SHELLOPTS=igncr: ../../lib/common/colortbl.h:1524:2: error: missing terminating " character 1524 | {"/svg/ ",0,255,255,255,0,0,0}, | ^~~~~~ Although not shown in the error message, this line actually contained a carriage return after /svg/: {"/svg/^M",0,255,255,255,0,0,0}, --- lib/common/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am index 8b847a6c5..9621125fa 100644 --- a/lib/common/Makefile.am +++ b/lib/common/Makefile.am @@ -44,7 +44,7 @@ brewer_lib : $(top_srcdir)/lib/common/brewer_colors $(top_srcdir)/awk/brewer.aw $(AWK) -f $(top_srcdir)/awk/brewer.awk $(top_srcdir)/lib/common/brewer_colors > brewer_lib svgcolor_lib : $(top_srcdir)/lib/common/svgcolor_names $(top_srcdir)/awk/svgcolor.awk - $(AWK) -f $(top_srcdir)/awk/svgcolor.awk $(top_srcdir)/lib/common/svgcolor_names > svgcolor_lib + $(AWK) -v RS="\r*\n" -f $(top_srcdir)/awk/svgcolor.awk $(top_srcdir)/lib/common/svgcolor_names > svgcolor_lib htmllex.o htmllex.lo: htmllex.c htmllex.h htmlparse.h htmlparse.o htmlparse.lo: htmlparse.c htmlparse.h -- 2.49.0