aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2017-05-17 19:28:39 +0100
committerSimon Tatham <anakin@pobox.com>2017-05-17 19:28:49 +0100
commitad56c28a707e037ec879f7feba4e711ae293dfa2 (patch)
tree069db16bf340c8c008b26b0034f8f41e63f1fbec
parent4aa85aa621dd2fd0b33a74ceb6821213846df7da (diff)
downloadwix-on-linux-ad56c28a707e037ec879f7feba4e711ae293dfa2.tar.gz
wix-on-linux-ad56c28a707e037ec879f7feba4e711ae293dfa2.tar.bz2
wix-on-linux-ad56c28a707e037ec879f7feba4e711ae293dfa2.zip
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.
-rw-r--r--fake-winterop.c3
1 files changed, 2 insertions, 1 deletions
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,
45 ctx->nargs = 0; 45 ctx->nargs = 0;
46 ctx->argsize = 16; 46 ctx->argsize = 16;
47 ctx->args = snewn(ctx->argsize, char *); 47 ctx->args = snewn(ctx->argsize, char *);
48 ctx->args[ctx->nargs++] = dupcat("makecab.py", (const char *)NULL); 48 ctx->args[ctx->nargs++] = dupcat(getenv("WIX"), "/", "makecab.py",
49 (const char *)NULL);
49 ctx->args[ctx->nargs++] = ctx->outfile; 50 ctx->args[ctx->nargs++] = ctx->outfile;
50 *out_ctx = ctx; 51 *out_ctx = ctx;
51 return 0; 52 return 0;