From 738ba477598669da2b082c3a52367877ff0daa0d Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Sun, 9 May 2021 07:57:52 -0600
Subject: [PATCH] Allow splint to build with bison 3.7. The y.tab.c file
 equivalent now includes the generated header so we need to update the path in
 the .c files when renaming the header.

---
 src/Makefile.am | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b022d09..6e4c77e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -270,7 +270,7 @@ signature_gen.h: bison.head signature.tab.h bison.reset
 	cat $^ >$@
 
 signature.c: bison.head signature.tab.c bison.reset
-	cat $^ >$@
+	cat $^ | $(SED) 's/signature\.tab\.h/signature_gen.h/g' >$@
 
 # CGrammar
 cgrammar.tab.c: cgrammar.y
@@ -281,10 +281,10 @@ cgrammar.tab.h: cgrammar.tab.c
 	@echo $@ generated
 
 cgrammar_tokens.h: bison.head cgrammar.tab.h bison.reset
-	cat $^ | $(SED) 's/YYSTYPE/cgrammar_YYSTYPE/g' | $(SED) 's/lsllex/cgrammar_lsllex/g' >$@
+	cat $^ | $(SED) -e 's/YYSTYPE/cgrammar_YYSTYPE/g' -e 's/lsllex/cgrammar_lsllex/g' >$@
 
 cgrammar.c: bison.head cgrammar.tab.c bison.reset
-	cat $^ | $(SED) 's/YYSTYPE/cgrammar_YYSTYPE/g' | $(SED) 's/lsllex/cgrammar_lsllex/g' >$@
+	cat $^ | $(SED) -e 's/YYSTYPE/cgrammar_YYSTYPE/g' -e 's/lsllex/cgrammar_lsllex/g' -e 's/cgrammar\.tab\.h/cgrammar_tokens.h/g' >$@
 
 # MTGrammar
 mtgrammar.tab.c: mtgrammar.y
@@ -298,7 +298,7 @@ mtgrammar_tokens.h: bison.head mtgrammar.tab.h bison.reset
 	cat $^ >$@
 
 mtgrammar.c: bison.head mtgrammar.tab.c bison.reset
-	cat $^ >$@
+	cat $^ | $(SED) 's/mtgrammar\.tab\.h/mtgrammar_tokens.h/g' >$@
 
 # LLGrammar
 
@@ -313,7 +313,7 @@ llgrammar_gen.h: bison.head llgrammar.tab.h bison.reset
 	cat $^ >$@
 
 llgrammar.c: bison.head llgrammar.tab.c bison.reset
-	cat $^ >$@
+	cat $^ | $(SED) 's/llgrammar\.tab\.h/llgrammar_gen.h/g' >$@
 
 # CScanner
 
@@ -321,7 +321,7 @@ cscanner.lex.c: cscanner.l cgrammar_tokens.h
 	$(FLEX) $(LFLAGS) -o $@ $<
 
 cscanner.c: flex.head cscanner.lex.c flex.reset
-	cat $^ | $(SED) 's/YYSTYPE/cgrammar_YYSTYPE/g'  | $(SED) 's/lsllex/cgrammar_lsllex/g' >$@
+	cat $^ | $(SED) -e 's/YYSTYPE/cgrammar_YYSTYPE/g' -e 's/lsllex/cgrammar_lsllex/g' >$@
 
 ## Flag codes