diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-30 21:28:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-30 21:28:19 -0400 |
| commit | 16dbcafb06205bd193bc2656dfbdaf20865ab203 (patch) | |
| tree | f50332f786ec3ac97a1818c64de00f30d19fcfb8 | |
| parent | c5c5f859d37bc46f912cca9ba0fa0e1300062e40 (diff) | |
| parent | a6ea34977b0c053cfc330a207961374f58911a7f (diff) | |
| download | tor-16dbcafb06205bd193bc2656dfbdaf20865ab203.tar.gz tor-16dbcafb06205bd193bc2656dfbdaf20865ab203.zip | |
Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2
| -rw-r--r-- | changes/win-bundle-path | 4 | ||||
| -rw-r--r-- | contrib/package_nsis-mingw.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/win-bundle-path b/changes/win-bundle-path new file mode 100644 index 0000000000..32ff514ef2 --- /dev/null +++ b/changes/win-bundle-path @@ -0,0 +1,4 @@ + o Packaging changes: + - Remove absolute path from makensis.exe command to build Tor expert bundle + in order to make it easier to automate package builds + diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 59811f4f11..b8a46cdbee 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -91,5 +91,5 @@ clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample cp contrib/tor-mingw.nsi.in win_tmp/contrib/ cd win_tmp -"C:\Program Files\NSIS\makensis.exe" contrib/tor-mingw.nsi.in +makensis.exe contrib/tor-mingw.nsi.in |