diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-17 14:06:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-17 14:06:47 -0400 |
| commit | 4b36481e24fbe7ed3cad2b159bed14c8150e9a67 (patch) | |
| tree | 98a2b516c8aaed44180cea60ac96e618dfe75ce5 | |
| parent | b266b9a078393f54a2d78a2e2fc12faf4e1fdeae (diff) | |
specify makensis path in build script
| -rw-r--r-- | Build/NullSoftInstaller.hs | 2 | ||||
| -rw-r--r-- | standalone/windows/build.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 8894585b6..a2259caa8 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 1b42c03cc..f751978f1 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 () { |