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
This commit is contained in:
Andrew Lewman 2007-12-06 18:46:59 +00:00
parent 75c38a2c88
commit c414de953b
2 changed files with 6 additions and 6 deletions

View File

@ -89,8 +89,8 @@ ln -sf $TARGET/tor .
ln -sf $TARGET/tor-resolve . ln -sf $TARGET/tor-resolve .
cd /usr/share/man/man1 cd /usr/share/man/man1
MAN1=$TARGET/man/man1 MAN1=$TARGET/share/man/man1
ln -sf $MAN1/*.1 . #ln -sf $MAN1/*.1 .
if [ -d /Library/StartupItems/Privoxy ]; then if [ -d /Library/StartupItems/Privoxy ]; then
find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel

View File

@ -10,10 +10,10 @@
!define WEBSITE "https://www.torproject.org/" !define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE" !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" !define BIN "..\bin"
SetCompressor lzma SetCompressor /SOLID lzma
OutFile ${INSTALLER} OutFile ${INSTALLER}
InstallDir $PROGRAMFILES\Tor InstallDir $PROGRAMFILES\Tor
SetOverWrite ifnewer SetOverWrite ifnewer
@ -25,10 +25,10 @@ CRCCheck on
XPStyle on XPStyle on
VIProductVersion "${VERSION}" VIProductVersion "${VERSION}"
VIAddVersionKey "ProductName" "The Onion Router: Tor" VIAddVersionKey "ProductName" "The Onion Router: Tor"
VIAddVersionKey "Comments" "https://www.torproject.org/" VIAddVersionKey "Comments" "${WEBSITE}"
VIAddVersionKey "LegalTrademarks" "Three line BSD" VIAddVersionKey "LegalTrademarks" "Three line BSD"
VIAddVersionKey "LegalCopyright" "©2004-2007, Roger Dingledine, Nick Mathewson" 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}" VIAddVersionKey "FileVersion" "${VERSION}"
!define MUI_WELCOMEPAGE_TITLE "Welcome to the Tor ${VERSION} Setup Wizard" !define MUI_WELCOMEPAGE_TITLE "Welcome to the Tor ${VERSION} Setup Wizard"