From 716cbb0627f1432bae86b2f3daa1261c0e907776 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Sun, 12 Feb 2017 23:48:42 +0100 Subject: blogc-make: use absolute path for runserver rule --- src/blogc-make/exec.c | 4 ++-- src/blogc-make/exec.h | 2 +- src/blogc-make/rules.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blogc-make/exec.c b/src/blogc-make/exec.c index ee86f15..e1ff238 100644 --- a/src/blogc-make/exec.c +++ b/src/blogc-make/exec.c @@ -305,7 +305,7 @@ bm_exec_blogc(bm_settings_t *settings, bc_trie_t *variables, bool listing, int -bm_exec_blogc_runserver(bm_settings_t *settings, bool verbose) +bm_exec_blogc_runserver(const char *output_dir, bool verbose) { bc_string_t *cmd = bc_string_new(); @@ -341,7 +341,7 @@ bm_exec_blogc_runserver(bm_settings_t *settings, bool verbose) free(tmp); } - char *tmp = bc_shell_quote(bc_trie_lookup(settings->settings, "output_dir")); + char *tmp = bc_shell_quote(output_dir); bc_string_append_printf(cmd, " %s", tmp); free(tmp); diff --git a/src/blogc-make/exec.h b/src/blogc-make/exec.h index 04bd44e..8c42c9f 100644 --- a/src/blogc-make/exec.h +++ b/src/blogc-make/exec.h @@ -22,6 +22,6 @@ char* bm_exec_build_blogc_cmd(bm_settings_t *settings, bc_trie_t *variables, int bm_exec_blogc(bm_settings_t *settings, bc_trie_t *variables, bool listing, bm_filectx_t *template, bm_filectx_t *output, bc_slist_t *sources, bool verbose, bool only_first_source); -int bm_exec_blogc_runserver(bm_settings_t *settings, bool verbose); +int bm_exec_blogc_runserver(const char *output_dir, bool verbose); #endif /* _MAKE_EXEC_H */ diff --git a/src/blogc-make/rules.c b/src/blogc-make/rules.c index 1f18d5e..9516dc9 100644 --- a/src/blogc-make/rules.c +++ b/src/blogc-make/rules.c @@ -624,7 +624,7 @@ runserver_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bool verbose) return 3; } - bm_exec_blogc_runserver(ctx->settings, verbose); + bm_exec_blogc_runserver(ctx->output_dir, verbose); return 0; } -- cgit v1.2.3-18-g5258