Use docbook2* paths found during configure for actual build

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f9682dd..e8a5599 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,16 @@ docsgml = \
        doc/rapi.sgml \
        doc/iallocator.sgml
 
+docrst = \
+       doc/design-2.0-commandline-parameters.rst \
+       doc/design-2.0-disk-handling.rst \
+       doc/design-2.0-index.rst \
+       doc/design-2.0-job-queue.rst \
+       doc/design-2.0-locking.rst \
+       doc/design-2.0-master-daemon.rst
+
 doc_DATA = \
+       $(patsubst %.rst,%.html,$(docrst)) \
        $(patsubst %.sgml,%.html,$(docsgml)) \
        $(patsubst %.sgml,%.pdf,$(docsgml))
 
@@ -134,11 +143,13 @@ EXTRA_DIST = \
        DEVNOTES \
        autotools/docbook-wrapper \
        devel/upload.in \
+       $(docrst) \
        $(docsgml) \
        doc/build-rapi-resources-doc \
        doc/examples/ganeti.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
+       doc/locking.txt \
        test/testutils.py \
        test/mocks.py \
        $(dist_TESTS) \
@@ -217,21 +228,24 @@ man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
 doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
 
 doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
+doc/%.html: doc/%.rst
+       $(RST2HTML) $< $@
 
-doc/rapi.pdf doc/rapi.html: doc/rapi-resources.sgml
+doc/rapi.pdf doc/rapi.html doc/rapi.in: doc/rapi-resources.sgml
 
 doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
        PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
 
 man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
 man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
 man/footer.sgml $(TESTS): srclinks