# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1406916395 14400
# Node ID 7761c281aac09e9ccf5c0b82404366c31aa74597
# Parent  c59745865c7f6656ebd4898e07d6e46746640ef9
fix botched merge

diff -r c59745865c7f -r 7761c281aac0 libinterp/parse-tree/module.mk
--- a/libinterp/parse-tree/module.mk	Fri Aug 01 09:06:21 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 \