doc/Makefile.am: do not install internal documentation

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 274f9b8b20b508436e0d71be0b3f33497b78de4a..07785a817c0d5cb0453690e1adcbd0b13b2d96ae 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,9 +6,7 @@ endif
 
 dist_man_MANS = babeltrace.1 babeltrace-log.1
 
-dist_doc_DATA = API.txt lttng-live.txt ref-counting.md logging-guide.adoc
-
-EXTRA_DIST = development.txt
+EXTRA_DIST = development.txt logging-guide.adoc ref-counting.md API.txt lttng-live.txt
 
 logging-guide.html: logging-guide.adoc
        asciidoc --verbose -a source-highlighter=pygments logging-guide.adoc

diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 75c75dd88312e17d1fdf007c5e38eeec5cb69b3c..c84bb770a3723798fa774eb24313d4a35dc879aa 100644 (file)
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -1,7 +1,10 @@
+API_DOC_INSTALL_DIR = "$(DESTDIR)$(docdir)/api"
+
 all-local: doxygen-doc
 
 install-data-local: doxygen-doc
-       cp -rv output/html "$(DESTDIR)$(docdir)/api"
+       $(mkdir_p) "$(API_DOC_INSTALL_DIR)"
+       cp -rv output/html "$(API_DOC_INSTALL_DIR)"
 
 @DX_RULES@
 

diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am
index 05d138b89eaaf1b530e83ab3cec6ca4ec601c4fd..a1e6af20f703e3f3cb2ff1b175172b1ccffdad13 100644 (file)
--- a/doc/images/Makefile.am
+++ b/doc/images/Makefile.am
@@ -1,4 +1,4 @@
-dist_doc_DATA = bt-ref01.svg bt-ref02.svg bt-ref03.svg bt-ref04.svg \
+EXTRA_DIST = bt-ref01.svg bt-ref02.svg bt-ref03.svg bt-ref04.svg \
        bt-ref05.svg bt-ref06.svg bt-ref07.svg bt-ref08.svg \
        bt-ref09.svg bt-ref10.svg bt-ref11.svg bt-ref12.svg \
        bt-ref13.svg