summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2011-09-06 14:56:17 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2011-09-06 14:56:17 +0200
commit78b663d0737016099098e8fdac52354549fdc26b (patch)
tree76d6f4c53ba3f835c60b088f53686bcf0eebecf9 /doc
parent33450f9ba99022c4b89fecce07652c665ed9c3e6 (diff)
parent9f1fed3ed1f77620334302616a6ed881ca78878d (diff)
downloadcalcurse-78b663d0737016099098e8fdac52354549fdc26b.zip
Merge branch 'maint'
Conflicts: src/io.c
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 287cddb..caa90d2 100644
--- 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 \