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() | |||
1574 | int i; | 1574 | int i; |
1575 | struct servent *serv; | 1575 | struct servent *serv; |
1576 | 1576 | ||
1577 | grecs_include_path_setup(DEFAULT_VERSION_INCLUDE_DIR, | 1577 | grecs_include_path_setup(DEFAULT_INCLUDE_DIR, |
1578 | DEFAULT_INCLUDE_DIR, NULL); | 1578 | DEFAULT_VERSION_INCLUDE_DIR, |
1579 | NULL); | ||
1579 | grecs_preprocessor = DEFAULT_PREPROCESSOR; | 1580 | grecs_preprocessor = DEFAULT_PREPROCESSOR; |
1580 | grecs_log_to_stderr = 1; | 1581 | grecs_log_to_stderr = 1; |
1581 | grecs_parser_options = GRECS_OPTION_QUOTED_STRING_CONCAT; | 1582 | 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) | |||
736 | static int | 736 | static int |
737 | expand_relative_dir(char **ret, struct wy_triplet *trp) | 737 | expand_relative_dir(char **ret, struct wy_triplet *trp) |
738 | { | 738 | { |
739 | if (trp) { | 739 | if (trp) |
740 | char const *dir; | 740 | return wy_expand_copy(ret, trp->relative_dir); |
741 | if (directive_get_value(trp, "directory", &dir) == 0) | ||
742 | return wy_expand_copy(ret, dir); | ||
743 | } | ||
744 | return WRDSE_UNDEF; | 741 | return WRDSE_UNDEF; |
745 | } | 742 | } |
746 | 743 | ||