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

diff -r d8abf813c69f -r 8de35ac99e80 libinterp/parse-tree/module.mk
--- 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 \