From: Florian Forster <octo@verplant.org>
Date: Tue, 21 Sep 2010 06:21:38 +0000 (+0200)
Subject: Merge branch 'master' of /var/lib/git/collection4
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=36f6513533637fdea37c4097a0baf15c83a90e40;hp=27aff67e3eb81812f66858bf1be1e933ba9d183c;p=collection4.git

Merge branch 'master' of /var/lib/git/collection4
---

diff --git a/README b/README
index ecbce71..6c7e0b9 100644
--- a/README
+++ b/README
@@ -78,6 +78,12 @@ Dependencies
   necessary to set the CPP- and LD-flags manually. In case of libyajl, which is
   not built with libtool, you may need to set the rpath, too.
 
+  When building from the Git repository, you'll need to have flex and bison (or
+  possibly lex and yacc) installed. These two programs are used to generate the
+  code for parsing the config file. If you are building from a tarball, the
+  generated .c and .h files are included and you don't need to have these
+  programs installed.
+
 
 Bugs
 ----