From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 7 Feb 2014 09:09:56 +0000 (+0100)
Subject: Revert "Bison: use %name-prefix directive rather than -p option"
X-Git-Tag: v5.0.13~13
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=a0b6afa0a1df8722572de79d563d3f0187f2fef7;p=yaz-moved-to-github.git

Revert "Bison: use %name-prefix directive rather than -p option"

This reverts commit 6fd59c085f99d8b823cd1d24d3110411c452cb87.
Fixes YAZ-734.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 92961ae..cdccb09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ libyaz_server_la_LIBADD = libyaz.la
 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS) -I$(top_srcdir)/libstemmer_c/include
 libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
 
-AM_YFLAGS=
+AM_YFLAGS=-p cql_
 
 # MARC8->UTF8 conversion is generated from codetables.xml
 marc8.c: charconv.tcl codetables.xml
diff --git a/src/cql.y b/src/cql.y
index 324c3e7..cf85690 100644
--- a/src/cql.y
+++ b/src/cql.y
@@ -55,7 +55,6 @@ int yyerror(void *lval, char *msg);
 %}
 
 
-%name-prefix "cql_"
 %lex-param {void *parm}
 %parse-param {void *parm}
 %pure-parser
diff --git a/win/makefile b/win/makefile
index b1b346f..35d0515 100644
--- a/win/makefile
+++ b/win/makefile
@@ -878,7 +878,7 @@ $(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
 !if $(HAVE_BISON)
 $(SRCDIR)\cql.c: $(SRCDIR)\cql.y
 	@cd $(SRCDIR)
-	$(BISON) -y -o cql.c cql.y
+	$(BISON) -y -p cql_ -o cql.c cql.y
 
 !endif