diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-07-21 04:30:19 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-07-21 04:30:19 +0000 |
| commit | 04c4a3349035f673619816ba453a062d592fae2d (patch) | |
| tree | 89dfa4456b0c3da867964379529f21dfa6ebbacc | |
| parent | 8484ac107ea354114b8c200fde8689a41ea3885a (diff) | |
| download | tor-04c4a3349035f673619816ba453a062d592fae2d.tar.gz tor-04c4a3349035f673619816ba453a062d592fae2d.zip | |
Grammar fixes for clarity.
svn:r6797
| -rw-r--r-- | trunk/contrib/osx/TorPostflight | 3 | ||||
| -rw-r--r-- | trunk/doc/tor-rpm-creation.txt | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/trunk/contrib/osx/TorPostflight b/trunk/contrib/osx/TorPostflight index 1d379362ae..5e74976bfa 100644 --- a/trunk/contrib/osx/TorPostflight +++ b/trunk/contrib/osx/TorPostflight @@ -56,7 +56,7 @@ chown $TORUSER $LOGDIR chgrp daemon $LOGDIR chmod 700 $LOGDIR -# Create the configuration file only if there wan't one already. +# Create the configuration file only if there wasn't one already. if [ ! -f $TARGET/torrc ]; then cp $TARGET/torrc.sample $TARGET/torrc fi @@ -114,6 +114,7 @@ if [ -f $PACKAGE_PATH/Contents/Resources/package_list.txt ]; then cp $PACKAGE_PATH/Contents/Resources/package_list.txt $TARGET/package_list.txt fi +# Determine how to start by OS Version if [ $OS = "tiger" ]; then if [ -f $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist ]; then cp $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist /System/Library/LaunchDaemons/net.freehaven.tor.plist diff --git a/trunk/doc/tor-rpm-creation.txt b/trunk/doc/tor-rpm-creation.txt index 8f6f69d195..e03d1c1a4a 100644 --- a/trunk/doc/tor-rpm-creation.txt +++ b/trunk/doc/tor-rpm-creation.txt @@ -5,7 +5,7 @@ distribution should have semi-current glibc installed by default. If you run into a distribution that does not work with glibc, or does not contain it, please let us know the details. -These are the exact same steps used to build the official rpms of Tor. +These are the exact steps used to build the official rpms of Tor. If you wish to further tune Tor binaries in rpm format beyond this list, see the GCC doc page for further options: @@ -23,12 +23,11 @@ this: %define target_cpu i386 %define target_os linux - The three parameters: target, target_cpu, and target_os are used throughout the "make dist-rpm" process. They control the parameters passed to "configure" and the final tuning of the binaries produced. The default settings, as shown above, create binaries for the widest -range of Intel x86 or compatible architectures. +range of Intel x86 or x86-compatible architectures. The parameters can be set as follows: @@ -39,7 +38,6 @@ Other possibilities are "mandrake" or "suse". This is passed to Therefore, this "target" parameter must be a valid OS for "configure" as well. - The "target_cpu" parameter: This parameter controls the optimization and tuning of your binaries via gcc and "configure". This parameter is passed to gcc via the -mtune= or @@ -49,10 +47,7 @@ through the --host, --build, and --target parameters. Therefore, this few common options for this parameter may be "athlon64, i686, pentium4" or others. - The "target_os" parameter: This parameter controls the target operating system. Normally, this is only "linux". If you wish to build rpms for a non-linux operating system, you can replace "linux" with your operating system. - - |