X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fdoc%2Finstall.txt;h=aef870c56f3d6e169eafbb9e8627f6b8f7a9a0cf;hb=342e0c3edeacf4eecd03da36c879ca817c64a0f3;hp=7e12e4647dd0b83097e339e563e9d060a2129d68;hpb=f1a6bbdb6793c9c3add1e84a437e990da4a0c6b0;p=libucw.git

diff --git a/ucw/doc/install.txt b/ucw/doc/install.txt
index 7e12e464..aef870c5 100644
--- a/ucw/doc/install.txt
+++ b/ucw/doc/install.txt
@@ -6,21 +6,14 @@ Prerequisities
 To build and run, you need:
 
   -  The GNU toolchain (gcc 4.0 or newer is required)
-  -  GNU bison and flex
   -  GNU bash 2.0 or newer
   -  Perl (any reasonably new version; 5.6.1 works for me)
-  -  ZLib (newer than stone-age)
   -  pkg-config
   -  Linux (porting to other systems should be easy)
-  -  GNUPlot 4.0 or newer (if you want to use Watson to draw nice graphs
-     with various statistics)
   -  Libjpeg, libpng and libungif to support all image formats
      (jpeg, png and gif). These libraries can be replaced by libgif (gif)
      and GraphicsMagick >= 1.1 (jpeg, png, gif and possible more formats).
      See sherlock/default.cfg for related configuration switches.
-  -  Mutt mail client for mail reports in some scripts
-     (any reasonably new version; 1.5.9 works)
-  -  GNU readline (optional, only non-free version of Sherlock)
 
 Compiling
 ---------
@@ -28,21 +21,19 @@ First of all, you need to run the `configure` script to set up compile-time
 options. If you want to compile the library with the default feature set,
 just use:
 
-	./configure free
+	./configure
 
 If you need to set anything unusual, please consult <<configure:>> for details.
 
 The defaults determined by the configure script should be correct on Linux/i386,
 on other architectures you will probably need to tweak the CPU detection section
-in `ucw/autoconf.cfg` and possibly also the typedefs in `ucw/config.h`.
+in `ucw/perl/UCW/Configure/C.pm` and possibly also the typedefs in `ucw/config.h`.
 
-Then run
+Then run:
 
 	make
 
-which builds the whole package in the `run` directory and you can play there.
-If you want to install it anywhere else, just use
+It compiles the package. You need to install it (unless you specified
+a <<configure:local_build,local build>>). To do so, execute:
 
-//TODO Implement the installation
-
-	make install INSTALL_DIR=/where/to/install
+	make install