[icinga-checkins] icinga.org: icinga2/master: automake: fix asciidoc DATA includes for make

git at icinga.org git at icinga.org
Thu Feb 7 19:57:05 CET 2013


Module: icinga2
Branch: master
Commit: 021ca766428fcc64cfac976c2b74b4f16372f2b8
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=021ca766428fcc64cfac976c2b74b4f16372f2b8

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Thu Feb  7 19:57:23 2013 +0100

automake: fix asciidoc DATA includes for make

fixes #3635

---

 docs/Makefile.am |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 0de2cfb..415b5d6 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,14 +1,10 @@
 .PHONY: clean
 
 EXTRA_DIST = \
-	icinga2-config.txt \
-	icinga2-intro.txt \
 	icinga2.8
 
 icinga2docdir = ${docdir}
-icinga2doc_DATA = \
-	icinga2-config.html \
-	icinga2-intro.html
+icinga2doc_DATA =
 
 man1_MANS = \
 	icinga2.8
@@ -16,6 +12,14 @@ man1_MANS = \
 .SUFFIXES = .html .txt
 
 if AD_COND_doc
+EXTRA_DIST += \
+	icinga2-config.txt \
+	icinga2-intro.txt 
+
+icinga2doc_DATA += \
+	icinga2-config.html \
+	icinga2-intro.html
+
 .txt.html:
 	$(AD_ENV) $(AD_ASCIIDOC) -a toc -a numbered $<
 endif AD_COND_doc





More information about the icinga-checkins mailing list