From b1b332592fca973227deb471290f54c3820d5db7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 17 May 2013 14:06:47 -0400 Subject: [PATCH] specify makensis path in build script --- Build/NullSoftInstaller.hs | 2 +- standalone/windows/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 8894585b68..a2259caa8a 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -36,7 +36,7 @@ main = do let license = tmpdir licensefile mustSucceed "sh" [Param "-c", Param $ "zcat standalone/licences.gz > '" ++ license ++ "'"] writeFile nsifile $ makeInstaller gitannex license - mustSucceed "C:\\Program Files\\NSIS\\makensis" [File nsifile] + mustSucceed "makensis" [File nsifile] removeFile nsifile -- left behind if makensis fails where nsifile = "git-annex.nsi" diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 1b42c03ccd..f751978f1f 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -9,7 +9,7 @@ set -e HP="/c/Program Files (x86)/Haskell Platform/2012.4.0.0" FLAGS="-Webapp -Assistant -XMPP" -PATH="$HP/bin:$HP/lib/extralibs/bin:$PATH" +PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:$PATH" # Run a command in the cygwin environment. incygwin () {