backport candidates for win32 and osx. Fix some obvious win32 nsi

changes caught by Steve Topletz.  Fix the man page path in OSX as caught
by mmmpf.

svn:r12703

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index b9b34fcc845888dfb225f822edfa5be71475d8d2..b6b0f27222de3678353e20d3edd96b5964a61d95 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -89,8 +89,8 @@ ln -sf $TARGET/tor .
 ln -sf $TARGET/tor-resolve .
 
 cd /usr/share/man/man1
-MAN1=$TARGET/man/man1
-ln -sf $MAN1/*.1 .
+MAN1=$TARGET/share/man/man1
+#ln -sf $MAN1/*.1 .
 
 if [ -d /Library/StartupItems/Privoxy ]; then
   find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel

diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index f18661da644f9e0ef7d9dcdbf1f8a0e10e821f9a..1374ee25eabcce48298134417131623fe189c11c 100644 (file)
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -10,10 +10,10 @@
 !define WEBSITE "https://www.torproject.org/"
 
 !define LICENSE "LICENSE"
-;BIN is where it expects to find tor.exe, tor-resolve.exe, libcrypto.a and libssl.a
+;BIN is where it expects to find tor.exe and tor-resolve.exe
 !define BIN "..\bin"
 
-SetCompressor lzma
+SetCompressor /SOLID lzma
 OutFile ${INSTALLER}
 InstallDir $PROGRAMFILES\Tor
 SetOverWrite ifnewer
@@ -25,10 +25,10 @@ CRCCheck on
 XPStyle on
 VIProductVersion "${VERSION}"
 VIAddVersionKey "ProductName" "The Onion Router: Tor"
-VIAddVersionKey "Comments" "https://www.torproject.org/"
+VIAddVersionKey "Comments" "${WEBSITE}"
 VIAddVersionKey "LegalTrademarks" "Three line BSD"
 VIAddVersionKey "LegalCopyright" "©2004-2007, Roger Dingledine, Nick Mathewson"
-VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at https://www.torproject.org/"
+VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
 VIAddVersionKey "FileVersion" "${VERSION}"
 
 !define MUI_WELCOMEPAGE_TITLE "Welcome to the Tor ${VERSION} Setup Wizard"