X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=docs-xml%2Fconfigure.ac;h=9a7f9ce168ef1ed77b9721295dcb9a22ca4f73e4;hp=360c94291be8100c134597aeb82d0adf35e0a24c;hb=3315a28ea92438eca499fb87b863cbd2db50a6a6;hpb=4811e5852b3848f17b6eb920b7781fda287c9189

diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 360c94291be..9a7f9ce168e 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -37,7 +37,7 @@ DOCS_DEFINE_TARGET(ALL, [], [base requirements], [])
 DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex ps pdf])
 DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
 DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp])
-DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3])
+DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman])
 DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages])
 DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
 DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
@@ -55,4 +55,18 @@ fi
 
 AC_SUBST(TARGETS)
 
-AC_OUTPUT( Makefile.settings build/catalog.xml)
+. ../VERSION
+if test x"$DOC_VERSION" = x; then
+	#AC_MSG_ERROR([Please export DOC_VERSION variable])
+	VERSION_SUFFIX=""
+	if test x"$SAMBA_VERSION_PRE_RELEASE" != x; then
+		VERSION_SUFFIX=pre
+	fi
+	DOC_VERSION=${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}${VERSION_SUFFIX}
+else
+	AC_MSG_RESULT([DOC_VERSION: ${DOC_VERSION}])
+fi
+
+doc_version="${DOC_VERSION}"
+AC_SUBST(doc_version)
+AC_OUTPUT( Makefile.settings build/catalog.xml build/DTD/samba.build.version)