Mercurial > hg > octave-nkf

diff libinterp/parse-tree/module.mk @ 19169:7761c281aac0 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix botched merge
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 14:06:35 -0400
parents d8abf813c69f
children fe505ff21d5b 6b4dfb1e5afb
line wrap: on
line diff
--- a/libinterp/parse-tree/module.mk
+++ b/libinterp/parse-tree/module.mk
@@ -87,7 +87,7 @@
 
 parse-tree/oct-parse.yy: parse-tree/oct-parse.in.yy
 	case "$(BISON_API_PREFIX_DECL_STYLE)" in \
-	  *api*) api_prefix_decl='%define api.prefix "octave-"'; ;; \
+	  *api*) api_prefix_decl='%define api.prefix "octave_"'; ;; \
 	  *name*) api_prefix_decl='%name-prefix="octave_"'; ;; \
 	esac; \
 	case "$(BISON_PUSH_PULL_DECL_STYLE)" in \