From ac2cba2e88489af2b4e08ada05df0940cea14124 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Sat, 9 Oct 2021 15:58:46 +0200 Subject: [PATCH] common: autotools: make awk crlf agnostic when generating svgcolor_lib only when using Cygwin --- lib/common/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am index c440b6882..34b9b1ab0 100644 --- a/lib/common/Makefile.am +++ b/lib/common/Makefile.am @@ -43,8 +43,12 @@ color_lib : brewer_lib svgcolor_lib $(top_srcdir)/lib/common/color_names brewer_lib : $(top_srcdir)/lib/common/brewer_colors $(top_srcdir)/awk/brewer.awk $(AWK) -f $(top_srcdir)/awk/brewer.awk $(top_srcdir)/lib/common/brewer_colors > brewer_lib +if WITH_CYGWIN +AWK_OPTIONS=-v RS="\r*\n" +endif + svgcolor_lib : $(top_srcdir)/lib/common/svgcolor_names $(top_srcdir)/awk/svgcolor.awk - $(AWK) -v RS="\r*\n" -f $(top_srcdir)/awk/svgcolor.awk $(top_srcdir)/lib/common/svgcolor_names > svgcolor_lib + $(AWK) $(AWK_OPTIONS) -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.40.0