Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 13:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

package: move skeletons into data/skeletons

Browse Source 
* data/bison.m4, data/c++-skel.m4, data/c++.m4, data/c-like.m4,
* data/c-skel.m4, data/c.m4, data/d-skel.m4, data/d.m4, data/glr.c,
* data/glr.cc, data/java-skel.m4, data/java.m4, data/lalr1.cc,
* data/lalr1.d, data/lalr1.java, data/location.cc, data/stack.hh,
* data/variant.hh, data/yacc.c:
Move to...
* data/skeletons: here.
Use b4_skeletonsdir instead of b4_pkgdatadir.

* data/local.mk, src/output.c: Adjust.
This commit is contained in:
Akim Demaille
2018-12-24 19:08:35 +01:00
parent 0a4ddce822
commit 112ccb5ed7
23 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/output.c
View File

@@ -549,11 +549,12 @@ output_skeleton (void)
/* Compute the names of the package data dir and skeleton files. */
char const *m4 = (m4 = getenv ("M4")) ? m4 : M4;
char const *datadir = pkgdatadir ();
char *skeldir = xpath_join (datadir, "skeletons");
char *m4sugar = xpath_join (datadir, "m4sugar/m4sugar.m4");
char *m4bison = xpath_join (datadir, "bison.m4");
char *m4bison = xpath_join (skeldir, "bison.m4");
char *skel = (IS_PATH_WITH_DIR (skeleton)
? xstrdup (skeleton)
: xpath_join (datadir, skeleton));
: xpath_join (skeldir, skeleton));
/* Test whether m4sugar.m4 is readable, to check for proper
installation. A faulty installation can cause deadlock, so a
@@ -608,6 +609,7 @@ output_skeleton (void)
true, filter_fd);
}
free (skeldir);
free (m4sugar);
free (m4bison);
free (skel);
@@ -680,10 +682,12 @@ prepare (void)
/* About the skeletons. */
{
/* b4_pkgdatadir is used inside m4_include in the skeletons, so digraphs
/* b4_skeletonsdir is used inside m4_include in the skeletons, so digraphs
would never be expanded. Hopefully no one has M4-special characters in
his Bison installation path. */
MUSCLE_INSERT_STRING_RAW ("pkgdatadir", pkgdatadir ());
char *skeldir = xpath_join (pkgdatadir (), "skeletons");
MUSCLE_INSERT_STRING_RAW ("skeletonsdir", skeldir);
free (skeldir);
}
}