[PATCH xorg-docs 2/3] config: use the XORG_ENABLE_DOCS macro to control docs building

[Jeremy Huddleston]

So --disable-docs in this case means nothing is installed?

On Sep 13, 2010, at 11:39, Gaetan Nadon wrote:

> As used in all modules containing docs.
> It may look a bit over-kill in this case, but it will help
> batch building if it is consistent.
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
> configure.ac |    1 +
> sgmlrules.in |    2 ++
> 2 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 5be7a2f..b68126e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -37,6 +37,7 @@ m4_ifndef([XORG_MACROS_VERSION],
> 	  [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
> XORG_MACROS_VERSION(1.8)
> XORG_DEFAULT_OPTIONS
> +XORG_ENABLE_DOCS
> 
> DEFAULT_X11DOCDIR=${datadir}/X11/doc
> AC_ARG_WITH(x11docdir,
> diff --git a/sgmlrules.in b/sgmlrules.in
> index def4aa9..0fa8c4c 100644
> --- a/sgmlrules.in
> +++ b/sgmlrules.in
> @@ -28,6 +28,7 @@ INSTALL_FILES =
> 
> SUFFIXES = .sgml .txt .html .ps .pdf
> 
> +if ENABLE_DOCS
> if BUILD_TXTDOC
> INSTALL_FILES += $(TXT_FILES)
> .sgml.txt:
> @@ -55,6 +56,7 @@ INSTALL_FILES += $(HTML_FILES)
> 	@rm -f $@
> 	$(AM_V_GEN)$(MAKE_HTML) -u $<
> endif
> +endif ENABLE_DOCS
> 
> # x11docdir is expected to be defined by the including file.
> dist_x11doc_DATA = $(INSTALL_FILES) $(SGML_FILES)
> -- 
> 1.6.0.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel