From: Martin Ling <redacted>
Date: Fri, 6 Dec 2013 01:39:50 +0000 (+0000)
Subject: Fix hardcoded home directory (pass -DHOME=$HOME to makensis).
X-Git-Tag: sigrok-cli-0.5.0~56
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=e71b3ff7687695c6d61d751d06785f95bb6c606a;hp=6d1dbe35407ebdc1d3174bc18eeac2980807b9c4

Fix hardcoded home directory (pass -DHOME=$HOME to makensis).
---

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index c685728..5ea9bb5 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -78,13 +78,11 @@ RequestExecutionLevel admin
 
 # Path where the cross-compiled sigrok tools and libraries are located.
 # Change this to where-ever you installed libsigrok.a and so on.
-# TODO: Figure out how to use $HOME (of the host that runs "makensis").
-!define CROSS "/home/uwe/sr_mingw"
+!define CROSS "$%HOME%/sr_mingw"
 
 # Path where the cross-compiled MXE tools and libraries are located.
 # Change this to where-ever you installed MXE (and the files it built).
-# TODO: Figure out how to use $HOME (of the host that runs "makensis").
-!define MXE "/home/uwe/mxe-git/usr/i686-pc-mingw32"
+!define MXE "$%HOME%/mxe-git/usr/i686-pc-mingw32"
 
 
 # --- MUI pages ---------------------------------------------------------------