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

lib: introduce xpath_join

Browse Source 
* lib/path-join.h, lib/path-join.c: New.
* lib/local.mk: Adjust.
* src/output.c: Use it.
This commit is contained in:
Akim Demaille
2018-10-06 12:18:52 +02:00
parent a61a84ec6a
commit d13a7fdb0a
4 changed files with 83 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/output.c
View File

@@ -21,10 +21,10 @@
#include <config.h>
#include "system.h"
#include <concat-filename.h>
#include <configmake.h>
#include <filename.h>
#include <filename.h> /* IS_PATH_WITH_DIR */
#include <get-errno.h>
#include <path-join.h>
#include <quotearg.h>
#include <spawn-pipe.h>
#include <timevar.h>
@@ -531,11 +531,11 @@ 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 *m4sugar = xconcatenated_filename (datadir, "m4sugar/m4sugar.m4", NULL);
char *m4bison = xconcatenated_filename (datadir, "bison.m4", NULL);
char *m4sugar = xpath_join (datadir, "m4sugar/m4sugar.m4");
char *m4bison = xpath_join (datadir, "bison.m4");
char *skel = (IS_PATH_WITH_DIR (skeleton)
? xstrdup (skeleton)
: xconcatenated_filename (datadir, skeleton, NULL));
: xpath_join (datadir, skeleton));
/* Test whether m4sugar.m4 is readable, to check for proper
installation. A faulty installation can cause deadlock, so a