changeset 18979:8de35ac99e80 stable

fix botched merge
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 14:06:35 -0400
parents d8abf813c69f
children 50fccff7651c 1197f04eec09
files libinterp/parse-tree/module.mk
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/module.mk	Fri Aug 01 08:09:02 2014 -0400
+++ b/libinterp/parse-tree/module.mk	Fri Aug 01 14:06:35 2014 -0400
@@ -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 \