Merge branch 'maint'

Conflicts: src/io.c
2011-09-06 14:56:17 +02:00
parent 33450f9ba9 9f1fed3ed1
commit 78b663d073
13 changed files with 251 additions and 171 deletions
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,19 +5,19 @@ ASCIIDOC_ARGS = \
 	-n \
 	-a toc \
 	-a icons
-
-dist_doc_DATA = \
-	manual.html
 endif

 if HAVE_A2X
 A2X_ARGS = \
 	-d manpage \
 	-f manpage
+endif
+
+dist_doc_DATA = \
+	manual.html

 dist_man_MANS = \
 	calcurse.1
-endif

 EXTRA_DIST = \
 	manual.txt \