summaryrefslogtreecommitdiffstats
path: root/Makefile.am
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 /Makefile.am
parent33450f9ba99022c4b89fecce07652c665ed9c3e6 (diff)
parent9f1fed3ed1f77620334302616a6ed881ca78878d (diff)
downloadcalcurse-78b663d0737016099098e8fdac52354549fdc26b.tar.gz
calcurse-78b663d0737016099098e8fdac52354549fdc26b.zip
Merge branch 'maint'
Conflicts: src/io.c
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 9e17d2f..5dd1ed9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS= foreign
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = doc po src
+SUBDIRS = po src
+
+if ENABLE_DOCS
+SUBDIRS += doc
+endif
EXTRA_DIST = \
INSTALL \