git-svn-id: svn://cherokee-project.com/cherokee/trunk@2561 5dc97367-9…

…7f1-0310-9951-d761b3857238
cherokee · Dec 5, 2008 · 663f90f · 663f90f
1 parent b4feb68
commit 663f90f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -5,7 +5,6 @@ SUFFIXES = .txt .html
 .txt.html:
 	$(ASCIIDOC) -o $@ $(top_srcdir)/doc/$< 
 
-docdir = $(datadir)/doc/cherokee
 doc_DATA = \
 index.html \
 basics.html \