Permalink
Browse files

Fixing building documentation when build tree is other than the sourc…

…e tree.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
  • Loading branch information...
1 parent 14c18fa commit 53cd2700f62559774ec968ce00f297d44116bf88 @vguerra vguerra committed with sustrik Sep 25, 2013
Showing with 12 additions and 4 deletions.
  1. +8 −4 Makefile.am
  2. +4 −0 configure.ac
View
@@ -345,7 +345,8 @@ if DOC
# Build instructions.
.txt.xml:
- $(AM_V_GEN)$(ASCIIDOC) -d manpage -b docbook -f doc/asciidoc.conf \
+ $(AM_V_GEN)$(ASCIIDOC) -d manpage -b docbook \
+ -f $(abs_srcdir)/doc/asciidoc.conf \
-aversion=@NN_PACKAGE_VERSION@ -o $@ $<
SUFFIXES = .1 .3 .7 .1.html .3.html .7.html
@@ -358,17 +359,20 @@ SUFFIXES = .1 .3 .7 .1.html .3.html .7.html
.txt.1.html:
$(AM_V_GEN)$(ASCIIDOC) -d manpage -b xhtml11 \
- -a stylesheet=$(abs_srcdir)/doc/htmldoc.css -f doc/asciidoc.conf \
+ -a stylesheet=$(abs_srcdir)/doc/htmldoc.css \
+ -f $(abs_srcdir)/doc/asciidoc.conf \
-aversion=@NN_PACKAGE_VERSION@ -o $@ $<
.txt.3.html:
$(AM_V_GEN)$(ASCIIDOC) -d manpage -b xhtml11 \
- -a stylesheet=$(abs_srcdir)/doc/htmldoc.css -f doc/asciidoc.conf \
+ -a stylesheet=$(abs_srcdir)/doc/htmldoc.css \
+ -f $(abs_srcdir)/doc/asciidoc.conf \
-aversion=@NN_PACKAGE_VERSION@ -o $@ $<
.txt.7.html:
$(AM_V_GEN)$(ASCIIDOC) -d manpage -b xhtml11 \
- -a stylesheet=$(abs_srcdir)/doc/htmldoc.css -f doc/asciidoc.conf \
+ -a stylesheet=$(abs_srcdir)/doc/htmldoc.css \
+ -f $(abs_srcdir)/doc/asciidoc.conf \
-aversion=@NN_PACKAGE_VERSION@ -o $@ $<
# Cause man pages to be generated and installed.
View
@@ -180,6 +180,10 @@ AS_IF([test x"$enable_doc" = "xyes"], [
AS_IF([test x"$XMLTO" = "x"], [
AC_MSG_ERROR([Please install xmlto to build the documentation])
])
+ AS_IF([test ! -d "doc"], [
+ AC_PROG_MKDIR_P
+ AS_MKDIR_P("doc")
+ ])
])
AM_CONDITIONAL([DOC], [test x"$ASCIIDOC" != "x" -a x"$XMLTO" != "x" ])

0 comments on commit 53cd270

Please sign in to comment.