[or-cvs] [torbrowser/master 2/2] Fix some paths for os x

[erinn at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Tue, 26 Oct 2010 03:23:14 +0200
Subject: Fix some paths for os x
Commit: f5aa215584df497f0e3468d918051d5d40bd199e

---
 build-scripts/config/torrc-osx           |    4 ++--
 build-scripts/config/vidalia.conf.ff-osx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx
index 5cb5632..984fbfe 100644
--- a/build-scripts/config/torrc-osx
+++ b/build-scripts/config/torrc-osx
@@ -1,8 +1,8 @@
 # If non-zero, try to write to disk less frequently than we would otherwise.
 AvoidDiskWrites 1
 # Store working data, state, keys, and caches here.
-DataDirectory ../Contents/Resources/Data/Tor
-GeoIPFile ../Contents/Resources/Data/Tor/geoip
+DataDirectory ../../Contents/Resources/Data/Tor
+GeoIPFile ../../Contents/Resources/Data/Tor/geoip
 # Where to send logging messages.  Format is minSeverity[-maxSeverity]
 # (stderr|stdout|syslog|file FILENAME).
 Log notice stdout
diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx
index 713aa5b..c038242 100644
--- a/build-scripts/config/vidalia.conf.ff-osx
+++ b/build-scripts/config/vidalia.conf.ff-osx
@@ -9,4 +9,4 @@ RunProxyAtStart=true
 [Tor]
 ControlPort=9051
 TorExecutable=../../Contents/MacOS/tor
-Torrc=./torrc
+Torrc=../../Library/Vidalia/torrc
-- 
1.7.1