From 9d007987207f6a08c312fdaf7a47eb477fd8f819 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Fri, 31 Jan 2003 20:58:00 +0000
Subject: Tweak bison build rules so that we get the same error messages from
 bison 1.875 and later as we did from earlier bison releases.  Eventually we
 will probably want to adopt the newer message spelling ... but not yet. Per
 recent discussion on pgpatches. Note: I didn't change the build rules for
 bootstrap, ecpg, or plpgsql grammars, since these do not affect regression
 test results.

---
 src/backend/parser/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index c11098eac2a..d2401ec75e7 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for parser
 #
-# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.38 2002/11/01 22:52:33 tgl Exp $
+# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.39 2003/01/31 20:58:00 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -38,11 +38,17 @@ gram.o: $(srcdir)/scan.c
 
 $(srcdir)/gram.c: $(srcdir)/parse.h ;
 
+# The sed hack is so that we can get the same error messages with
+# bison 1.875 and later as we did with earlier bisons.  Eventually,
+# I suppose, we should re-standardize on "syntax error" --- in which
+# case flip the sed translation, but don't remove it.
+
 $(srcdir)/parse.h: gram.y
 ifdef YACC
 	$(YACC) -d $(YFLAGS) $<
-	mv -f y.tab.c $(srcdir)/gram.c
+	sed -e 's/"syntax error/"parse error/' < y.tab.c > $(srcdir)/gram.c
 	mv -f y.tab.h $(srcdir)/parse.h
+	rm -f y.tab.c
 else
 	@$(missing) bison $< $@
 endif
-- 
cgit v1.2.3