From 8b5bac09e3417f65a05895c639c19c13df123ca7 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 2 Jun 2017 13:26:02 -0400 Subject: [PATCH] doc/Makefile.am: do not install internal documentation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- doc/Makefile.am | 4 +--- doc/api/Makefile.am | 5 ++++- doc/images/Makefile.am | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 274f9b8b..07785a81 100644 --- 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 75c75dd8..c84bb770 100644 --- 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 05d138b8..a1e6af20 100644 --- 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 -- 2.34.1