Rebuild after ditching GNUisms in GNUMakefile.in

[privoxy.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 28a61cb..afcf150 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@
  *
  * Purpose     :  INSTALL file to help with installing from source.
  *
  *
  * Purpose     :  INSTALL file to help with installing from source.
  *

- * Copyright   :  Written by and Copyright (C) 2001-2008 the SourceForge
+ * Copyright   :  Written by and Copyright (C) 2001-2009 the

  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written


@@ -25,7 +25,7 @@
  *
  *                The GNU General Public License should be included with
  *                this file.  If not, you can view it at
  *
  *                The GNU General Public License should be included with
  *                this file.  If not, you can view it at

- *                http://www.gnu.org/copyleft/gpl.html
+ *                http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

  *                or write to the Free Software Foundation, Inc., 
  *                51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
  *                USA
  *                or write to the Free Software Foundation, Inc., 
  *                51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
  *                USA


@@ -40,9 +40,8 @@ compiler like gcc are required.
 
 When building from a source tarball, first unpack the source:
 
 
 When building from a source tarball, first unpack the source:
 

- tar xzvf privoxy-3.0.10-src* [.tgz or .tar.gz]
- cd privoxy-3.0.10
-
+ tar xzvf privoxy-3.0.18-beta-src.tar.gz
+ cd privoxy-3.0.18-beta

 
 For retrieving the current CVS sources, you'll need a CVS client installed.
 Note that sources from CVS are typically development quality, and may not be
 
 For retrieving the current CVS sources, you'll need a CVS client installed.
 Note that sources from CVS are typically development quality, and may not be


@@ -53,7 +52,6 @@ documentation, which might give commands like:
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co current
   cd current
 
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co current
   cd current
 

-

 This will create a directory named current/, which will contain the source
 tree.
 
 This will create a directory named current/, which will contain the source
 tree.
 


@@ -70,12 +68,10 @@ adduser, but the command syntax may vary from platform to platform).
 
   privoxy:*:7777:7777:privoxy proxy:/no/home:/no/shell
 
 
   privoxy:*:7777:7777:privoxy proxy:/no/home:/no/shell
 

-

 And then /etc/group, like:
 
   privoxy:*:7777:
 
 And then /etc/group, like:
 
   privoxy:*:7777:
 

-

 Some binary packages may do this for you.
 
 Then, to build from either unpacked tarball or CVS source:
 Some binary packages may do this for you.
 
 Then, to build from either unpacked tarball or CVS source:


@@ -88,13 +84,11 @@ Then, to build from either unpacked tarball or CVS source:
  make -n install  # (to see where all the files will go)
  make -s install  # (to really install, -s to silence output)
 
  make -n install  # (to see where all the files will go)
  make -s install  # (to really install, -s to silence output)
 

-

 Using GNU make, you can have the first four steps automatically done for you by
 just typing:
 
   make
 
 Using GNU make, you can have the first four steps automatically done for you by
 just typing:
 
   make
 

-

 in the freshly downloaded or unpacked source directory.
 
 To build an executable with security enhanced features so that users cannot
 in the freshly downloaded or unpacked source directory.
 
 To build an executable with security enhanced features so that users cannot


@@ -103,7 +97,6 @@ configurations, configure like this:
 
  ./configure  --disable-toggle  --disable-editor  --disable-force
 
 
  ./configure  --disable-toggle  --disable-editor  --disable-force
 

-

 Then build as above. In Privoxy 3.0.7 and later, all of these options can also
 be disabled through the configuration file.
 
 Then build as above. In Privoxy 3.0.7 and later, all of these options can also
 be disabled through the configuration file.
 


@@ -124,7 +117,6 @@ sure both already exist:
 
  make -s install  USER=privoxy GROUP=privoxy
 
 
  make -s install  USER=privoxy GROUP=privoxy
 

-

 The default installation path for make install is /usr/local. This may of
 course be customized with the various ./configure path options. If you are
 doing an install to anywhere besides /usr/local, be sure to set the appropriate
 The default installation path for make install is /usr/local. This may of
 course be customized with the various ./configure path options. If you are
 doing an install to anywhere besides /usr/local, be sure to set the appropriate


@@ -155,14 +147,13 @@ correct paths and values, if anything other than a default install is done.
 
 If install finds previous versions of local configuration files, most of these
 will not be overwritten, and the new ones will be installed with a "new"
 
 If install finds previous versions of local configuration files, most of these
 will not be overwritten, and the new ones will be installed with a "new"

-extension. default.action, default.filter, and standard.action will be
-overwritten. You will then need to manually update the other installed
-configuration files as needed. The default template files will be overwritten.
-If you have customized, local templates, these should be stored safely in a
-separate directory and defined in config by the "templdir" directive. It is of
-course wise to always back-up any important configuration files "just in case".
-If a previous version of Privoxy is already running, you will have to restart
-it manually.
+extension. default.action and default.filter will be overwritten. You will then
+need to manually update the other installed configuration files as needed. The
+default template files will be overwritten. If you have customized, local
+templates, these should be stored safely in a separate directory and defined in
+config by the "templdir" directive. It is of course wise to always back-up any
+important configuration files "just in case". If a previous version of Privoxy
+is already running, you will have to restart it manually.

 
 For more detailed instructions on how to build Redhat RPMs, Windows
 self-extracting installers, building on platforms with special requirements
 
 For more detailed instructions on how to build Redhat RPMs, Windows
 self-extracting installers, building on platforms with special requirements