2 files changed, 16 insertions, 4 deletions
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 0cdb317fda0..5e396ac8788 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.7 2002/11/01 22:52:33 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.8 2003/01/31 20:58:00 tgl Exp $
 
 subdir = contrib/cube
 top_builddir = ../..
@@ -17,11 +17,17 @@ cubeparse.o: cubescan.c
 
 cubeparse.c: cubeparse.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.
+
 cubeparse.h: cubeparse.y
 ifdef YACC
 	$(YACC) -d $(YFLAGS) -p cube_yy $<
-	mv -f y.tab.c cubeparse.c
+	sed -e 's/"syntax error/"parse error/' < y.tab.c > cubeparse.c
 	mv -f y.tab.h cubeparse.h
+	rm -f y.tab.c
 else
 	@$(missing) bison $< $@
 endif
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index 350e1347984..bb8ff205d91 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.7 2002/11/01 22:52:33 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.8 2003/01/31 20:58:00 tgl Exp $
 
 subdir = contrib/seg
 top_builddir = ../..
@@ -16,11 +16,17 @@ segparse.o: segscan.c
 
 segparse.c: segparse.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.
+
 segparse.h: segparse.y
 ifdef YACC
 	$(YACC) -d $(YFLAGS) -p seg_yy $<
-	mv -f y.tab.c segparse.c
+	sed -e 's/"syntax error/"parse error/' < y.tab.c > segparse.c
 	mv -f y.tab.h segparse.h
+	rm -f y.tab.c
 else
 	@$(missing) bison $< $@
 endif