From 663f90fcf68c01b35288c52c92cd16e6a90adae1 Mon Sep 17 00:00:00 2001
From: alobbs <alvaro@alobbs.com>
Date: Fri, 5 Dec 2008 19:16:45 +0000
Subject: [PATCH] git-svn-id: svn://cherokee-project.com/cherokee/trunk@2561
 5dc97367-97f1-0310-9951-d761b3857238

---
 ChangeLog       | 5 +++++
 configure.in    | 4 ++--
 doc/Makefile.am | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4c8a2344..68adfb8ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-05  Alvaro Lopez Ortega  <alvaro@octality.com>
+
+	* configure.in, doc/Makefile.am: Tries to deal with a autoconf +
+	automake issue related to the document installation.
+
 2008-12-05  Taher Shihadeh  <taher@octality.com>
 
 	* doc/cookbook_symfony.txt, doc/media/images/cookbook_symfony.png: 
diff --git a/configure.in b/configure.in
index 35bf5cca4..0a59294f5 100644
--- a/configure.in
+++ b/configure.in
@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 USA
 ])
 
-dnl require autoconf 2.56
-AC_PREREQ(2.56)
+dnl require autoconf 2.60
+AC_PREREQ([2.60])
 
 dnl Version
 m4_define([cherokee_major_version], [0])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8b2f5667e..c206c1237 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,7 +5,6 @@ SUFFIXES = .txt .html
 .txt.html:
 	$(ASCIIDOC) -o $@ $(top_srcdir)/doc/$< 
 
-docdir = $(datadir)/doc/cherokee
 doc_DATA = \
 index.html \
 basics.html \