From ad56c28a707e037ec879f7feba4e711ae293dfa2 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 17 May 2017 19:28:39 +0100 Subject: Find makecab.py via $WIX rather than $PATH. We have to define $WIX in any case for libpreload, so we might as well get our money's worth out of it and not also require the Wix directory to be on PATH. --- fake-winterop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fake-winterop.c b/fake-winterop.c index cc69179..b16952a 100644 --- a/fake-winterop.c +++ b/fake-winterop.c @@ -45,7 +45,8 @@ uint32_t CreateCabBegin(const char16_t *wzCab, const char16_t *wzCabDir, ctx->nargs = 0; ctx->argsize = 16; ctx->args = snewn(ctx->argsize, char *); - ctx->args[ctx->nargs++] = dupcat("makecab.py", (const char *)NULL); + ctx->args[ctx->nargs++] = dupcat(getenv("WIX"), "/", "makecab.py", + (const char *)NULL); ctx->args[ctx->nargs++] = ctx->outfile; *out_ctx = ctx; return 0; -- cgit v1.2.3-55-g6feb