Grammar fixes for clarity.

svn:r6797
This commit is contained in:
Andrew Lewman 2006-07-21 04:30:19 +00:00
parent 237c7ecbfd
commit 3f0e4622b6
2 changed files with 4 additions and 8 deletions

View File

@ -56,7 +56,7 @@ chown $TORUSER $LOGDIR
chgrp daemon $LOGDIR chgrp daemon $LOGDIR
chmod 700 $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 if [ ! -f $TARGET/torrc ]; then
cp $TARGET/torrc.sample $TARGET/torrc cp $TARGET/torrc.sample $TARGET/torrc
fi 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 cp $PACKAGE_PATH/Contents/Resources/package_list.txt $TARGET/package_list.txt
fi fi
# Determine how to start by OS Version
if [ $OS = "tiger" ]; then if [ $OS = "tiger" ]; then
if [ -f $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist ]; 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 cp $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist /System/Library/LaunchDaemons/net.freehaven.tor.plist

View File

@ -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 If you run into a distribution that does not work with glibc, or does
not contain it, please let us know the details. 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, If you wish to further tune Tor binaries in rpm format beyond this list,
see the GCC doc page for further options: see the GCC doc page for further options:
@ -23,12 +23,11 @@ this:
%define target_cpu i386 %define target_cpu i386
%define target_os linux %define target_os linux
The three parameters: target, target_cpu, and target_os are used The three parameters: target, target_cpu, and target_os are used
throughout the "make dist-rpm" process. They control the parameters throughout the "make dist-rpm" process. They control the parameters
passed to "configure" and the final tuning of the binaries produced. passed to "configure" and the final tuning of the binaries produced.
The default settings, as shown above, create binaries for the widest 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: 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 Therefore, this "target" parameter must be a valid OS for "configure" as
well. well.
The "target_cpu" parameter: The "target_cpu" parameter:
This parameter controls the optimization and tuning of your binaries via This parameter controls the optimization and tuning of your binaries via
gcc and "configure". This parameter is passed to gcc via the -mtune= or 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 few common options for this parameter may be "athlon64, i686, pentium4" or
others. others.
The "target_os" parameter: The "target_os" parameter:
This parameter controls the target operating system. Normally, this is This parameter controls the target operating system. Normally, this is
only "linux". If you wish to build rpms for a non-linux operating only "linux". If you wish to build rpms for a non-linux operating
system, you can replace "linux" with your operating system. system, you can replace "linux" with your operating system.