From 0a96ba819fb75b14465445336719dd44f9ecb8f7 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 2 Jan 2006 16:26:17 +0000 Subject: [PATCH] * src/output.c (output_skeleton): Don't hard wire the inclusion of c.m4. * data/c++.m4, data/glr.c, data/yacc.c: Include c.m4. * data/glr.cc: Do not include stack.hh. --- ChangeLog | 2 +- data/glr.c | 4 +++- data/yacc.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0b2c861..346b675b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ * src/output.c (output_skeleton): Don't hard wire the inclusion of c.m4. - * data/c++.m4: Include c.m4. + * data/c++.m4, data/glr.c, data/yacc.c: Include c.m4. * data/glr.cc: Do not include stack.hh. 2006-01-02 Joel E. Denny diff --git a/data/glr.c b/data/glr.c index ead86ab8..94f4c0c2 100644 --- a/data/glr.c +++ b/data/glr.c @@ -1,7 +1,7 @@ m4_divert(-1) -*- C -*- # GLR skeleton for Bison -# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +19,8 @@ m4_divert(-1) -*- C -*- # 02110-1301 USA +m4_include(b4_pkgdatadir/[c.m4]) + ## ---------------- ## ## Default values. ## ## ---------------- ## diff --git a/data/yacc.c b/data/yacc.c index 3a9314db..561ee320 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -20,7 +20,7 @@ m4_divert(-1) -*- C -*- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA - +m4_include(b4_pkgdatadir/[c.m4]) ## ---------------- ## ## Default values. ## -- 2.47.2