--without-docs: make install no longer installs any docs.

--HG--
branch : HEAD

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6d08cc55cf9f9d91da75812b46a890963370d881..7ea6c5233f5470e71b1111ac66bdfeedba2ae001 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,14 +1,18 @@
 SUBDIRS = wiki example-config
 
-doc_DATA = \
+docfiles = \
        auth-protocol.txt \
        documentation.txt \
        securecoding.txt \
        thread-refs.txt
 
+if BUILD_DOCS
+doc_DATA = $(docfiles)
+endif
+
 EXTRA_DIST = \
        dovecot-initd.sh \
        mkcert.sh \
        dovecot-openssl.cnf \
        solr-schema.xml \
-       $(doc_DATA)
+       $(docfiles)

diff --git a/doc/wiki/Makefile.am.in b/doc/wiki/Makefile.am.in
index 644391806e74370c7c94ff2fd41909678e1a8910..61e3ba5b4d16419e30f7c42733e208c3f8f53a3a 100644 (file)
--- a/doc/wiki/Makefile.am.in
+++ b/doc/wiki/Makefile.am.in
@@ -3,4 +3,8 @@ wikidir = $(docdir)/wiki
 EXTRA_DIST = \
        $(wiki_DATA)
 
-wiki_DATA = 
\ No newline at end of file
+if BUILD_DOCS
+wiki_DATA = $(wikifiles)
+endif
+
+wikifiles = 
\ No newline at end of file