X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/328201a5b60e1ba8de380af7d39fbfc732afb614..5e599ff3ee67aaa9b94cc5d5a2455f81db766d4e:/INSTALL

diff --git a/INSTALL b/INSTALL
index 6238416..5abd69c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -48,6 +48,7 @@ Before installing, please verify that you have the following programs:
 - `Python IP address manipulation library
   <http://code.google.com/p/ipaddr-py/>`_
 - `Bitarray Python library <http://pypi.python.org/pypi/bitarray/>`_
+- `GNU Make <http://www.gnu.org/software/make/>`_
 
 These programs are supplied as part of most Linux distributions, so
 usually they can be installed via the standard package manager. Also
@@ -55,7 +56,7 @@ many of them will already be installed on a standard machine. On
 Debian/Ubuntu, you can use this command line to install all required
 packages, except for RBD, DRBD and Xen::
 
-  $ apt-get install lvm2 ssh bridge-utils iproute iputils-arping \
+  $ apt-get install lvm2 ssh bridge-utils iproute iputils-arping make \
                     ndisc6 python python-pyopenssl openssl \
                     python-pyparsing python-simplejson python-bitarray \
                     python-pyinotify python-pycurl python-ipaddr socat fping
@@ -66,7 +67,7 @@ If bitarray is missing it can be installed from easy-install::
 
 Or on newer distributions (eg. Debian Wheezy) the above becomes::
 
-  $ apt-get install lvm2 ssh bridge-utils iproute iputils-arping \
+  $ apt-get install lvm2 ssh bridge-utils iproute iputils-arping make \
                     ndisc6 python python-openssl openssl \
                     python-pyparsing python-simplejson python-bitarray \
                     python-pyinotify python-pycurl python-ipaddr socat fping
@@ -83,12 +84,12 @@ For example::
   $ cd / && sudo easy_install \
             affinity \
             bitarray \
-            ipaddr \
+            ipaddr
 
 
 On Fedora to install all required packages except RBD, DRBD and Xen::
 
-  $ yum install openssh openssh-clients bridge-utils iproute ndisc6 \
+  $ yum install openssh openssh-clients bridge-utils iproute ndisc6 make \
                 pyOpenSSL pyparsing python-simplejson python-inotify \
                 python-lxm socat fping python-bitarray python-ipaddr
 
@@ -166,9 +167,10 @@ If using a distribution which does not provide them, first install
 the Haskell platform. You can also install ``cabal`` manually::
 
   $ apt-get install cabal-install
+  $ cabal update
 
-Then install the additional libraries via
-``cabal``::
+Then install the additional libraries (only the ones not available in your
+distribution packages) via ``cabal``::
 
   $ cabal install json network parallel utf8-string curl
 
@@ -176,8 +178,8 @@ Haskell optional features
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Optionally, more functionality can be enabled if your build machine has
-a few more Haskell libraries enabled: the ``ganeti-confd`` daemon
-(``--enable-confd``) and the monitoring daemon
+a few more Haskell libraries enabled: the ``ganeti-confd`` and
+``ganeti-luxid`` daemon (``--enable-confd``) and the monitoring daemon
 (``--enable-mond``). The list of extra dependencies for these is:
 
 - `hslogger <http://software.complete.org/hslogger>`_, version 1.1 and
@@ -204,7 +206,7 @@ can use either apt::
 
 or ``cabal``, after installing a required non-Haskell dependency::
 
-  $ apt-get install libpcre3-dev
+  $ apt-get install libpcre3-dev libcurl4-openssl-dev
   $ cabal install hslogger Crypto text hinotify==0.3.2 regex-pcre \
                   attoparsec vector snap-server