diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2020-04-29 22:47:17 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2020-04-29 22:47:17 +0300 |
| commit | 3f32d6ea3af2f27384e001dd2478aab285d42e25 (patch) | |
| tree | 4d5f22ce879293518a3562a534313cb111a213f1 | |
| parent | 881ca6f6bba8e055902903798193b6102368cbb3 (diff) | |
| download | wydawca-3f32d6ea3af2f27384e001dd2478aab285d42e25.tar.gz wydawca-3f32d6ea3af2f27384e001dd2478aab285d42e25.tar.bz2 | |
Minor changes.
* src/config.c (config_init): Place the user include directory before
the version-specific include directory.
* src/triplet.c (expand_relative_dir): Use trp->relative_dir).
| -rw-r--r-- | src/config.c | 5 | ||||
| -rw-r--r-- | src/triplet.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/config.c b/src/config.c index 3ba0e5a..79201d1 100644 --- a/src/config.c +++ b/src/config.c @@ -1574,8 +1574,9 @@ config_init() int i; struct servent *serv; - grecs_include_path_setup(DEFAULT_VERSION_INCLUDE_DIR, - DEFAULT_INCLUDE_DIR, NULL); + grecs_include_path_setup(DEFAULT_INCLUDE_DIR, + DEFAULT_VERSION_INCLUDE_DIR, + NULL); grecs_preprocessor = DEFAULT_PREPROCESSOR; grecs_log_to_stderr = 1; grecs_parser_options = GRECS_OPTION_QUOTED_STRING_CONCAT; diff --git a/src/triplet.c b/src/triplet.c index 840ecce..f1c5b6f 100644 --- a/src/triplet.c +++ b/src/triplet.c @@ -736,11 +736,8 @@ DECL_TRIPLET_EXP(source_dir, spool->source_dir) static int expand_relative_dir(char **ret, struct wy_triplet *trp) { - if (trp) { - char const *dir; - if (directive_get_value(trp, "directory", &dir) == 0) - return wy_expand_copy(ret, dir); - } + if (trp) + return wy_expand_copy(ret, trp->relative_dir); return WRDSE_UNDEF; } |