* m4/m4.m4: New, from CVS Autoconf.

* configure.in: Invoke it.
* src/output.c (output_skeleton): Use its result instead of the
hard coded name.
This commit is contained in:
Akim Demaille
2002-02-25 14:00:57 +00:00
parent 381fb12e1e
commit abe017f60d
4 changed files with 20 additions and 5 deletions

View File

@@ -1001,15 +1001,17 @@ output_skeleton (void)
/* Invoke m4 on the definition of the muscles, and the skeleton. */
{
const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR");
const char *m4 = getenv ("M4");
if (!m4)
m4 = M4;
if (!bison_pkgdatadir)
bison_pkgdatadir = PKGDATADIR;
if (trace_flag)
fprintf (stderr,
"running: m4 -I %s m4sugar/m4sugar.m4 %s %s\n",
bison_pkgdatadir, tempfile, skeleton);
skel_in = readpipe ("m4",
"-I",
bison_pkgdatadir,
"running: %s -I %s m4sugar/m4sugar.m4 %s %s\n",
m4, bison_pkgdatadir, tempfile, skeleton);
skel_in = readpipe (m4,
"-I", bison_pkgdatadir,
"m4sugar/m4sugar.m4",
tempfile,
skeleton,