X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=doc%2Fman%2FMakefile.am;h=845e475dd4e82c0c73fccc2927a76da7bd7ec756;hb=c7ab9bea55e4fdbdd82fabbff0f705d73c1f22f6;hp=860c8be209a2fff01034c4a90578fd1c6bc405e3;hpb=c4ee49840e6233047717851e7731477481500f44;p=lttng-tools.git

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 860c8be20..845e475dd 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -21,7 +21,6 @@ MAN1_NAMES = \
 	lttng-disable-channel \
 	lttng-add-context \
 	lttng-list \
-	lttng-calibrate \
 	lttng-track \
 	lttng-untrack \
 	lttng-status \
@@ -30,7 +29,8 @@ MAN1_NAMES = \
 	lttng-enable-event \
 	lttng-disable-event \
 	lttng-crash \
-	lttng-metadata
+	lttng-metadata \
+	lttng-regenerate
 MAN3_NAMES =
 MAN8_NAMES = lttng-sessiond lttng-relayd
 MAN1_NO_ASCIIDOC_NAMES =
@@ -52,7 +52,7 @@ COMMON_TXT = \
 	$(srcdir)/common-cmd-help-options.txt
 
 # config
-ASCIIDOC_CONF = $(builddir)/asciidoc.conf
+ASCIIDOC_CONF = $(srcdir)/asciidoc.conf
 ASCIIDOC_ATTRS_CONF = $(builddir)/asciidoc-attrs.conf
 XSL_FILES = \
 	manpage.xsl \
@@ -81,6 +81,11 @@ ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -f $(ASCIIDOC_ATTRS_CONF) -d manpage
 ADOC_DOCBOOK = $(ADOC) -b docbook
 XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man
 
+# only add this dependency if we can build the man pages because it's
+# a file generated by the configure script, so it's more recent than
+# the pregenerated man pages in a tarball
+COMMON_DEPS += $(ASCIIDOC_ATTRS_CONF)
+
 # recipes
 %.1.xml: $(srcdir)/%.1.txt $(COMMON_DEPS)
 	$(ADOC_DOCBOOK) -o $@ $<