diff options
| author | Andrew Lewman <andrew@torproject.org> | 2007-12-06 18:46:59 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2007-12-06 18:46:59 +0000 |
| commit | c414de953bf73f5793dfbba224dadf52023c3234 (patch) | |
| tree | 9170d46abb38aff432f43d79013b21105b040125 /contrib | |
| parent | 75c38a2c88eb4d34d2fe8e5137aaa6cd6a8d8f3b (diff) | |
| download | tor-c414de953bf73f5793dfbba224dadf52023c3234.tar.gz tor-c414de953bf73f5793dfbba224dadf52023c3234.zip | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/osx/TorPostflight | 4 | ||||
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight index b9b34fcc84..b6b0f27222 100644 --- 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 f18661da64..1374ee25ea 100644 --- 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" |