[PATCH xserver] Install xml versions of specs even if HAVE_XMLTO is false

Alan Coopersmith alan.coopersmith at oracle.com
Thu Jun 16 13:55:55 PDT 2011


On 06/15/11 02:11 PM, Gaetan Nadon wrote:
> DocBook/XML input source is also a usefull output format that can be viewed
> with an XML viewer or editor and by some O/S help system.
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  doc/dtrace/Makefile.am |    2 --
>  docbook.am             |    2 ++
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/dtrace/Makefile.am b/doc/dtrace/Makefile.am
> index aaf5a12..df26d2b 100644
> --- a/doc/dtrace/Makefile.am
> +++ b/doc/dtrace/Makefile.am
> @@ -1,6 +1,5 @@
>  
>  if ENABLE_DOCS
> -if HAVE_XMLTO
>  if XSERVER_DTRACE
>  
>  # Main DocBook/XML files (DOCTYPE book)
> @@ -13,5 +12,4 @@ shelfdir = $(docdir)
>  include $(top_srcdir)/docbook.am
>  
>  endif XSERVER_DTRACE
> -endif HAVE_XMLTO
>  endif ENABLE_DOCS
> diff --git a/docbook.am b/docbook.am
> index 6902e98..eb3bf0c 100644
> --- a/docbook.am
> +++ b/docbook.am
> @@ -20,6 +20,7 @@ shelf_DATA =
>  # DocBook/XML file with chapters, appendix and images it includes
>  dist_shelf_DATA = $(docbook) $(chapters)
>  
> +if HAVE_XMLTO
>  #
>  # Generate DocBook/XML output formats with or without stylesheets
>  #
> @@ -93,5 +94,6 @@ XSLTPROC_FLAGS =					\
>  
>  endif HAVE_XSLTPROC
>  endif HAVE_STYLESHEETS
> +endif HAVE_XMLTO
>  
>  CLEANFILES = $(shelf_DATA)

Peter's right about the spelling correction in the comment, but other
than that, looks okay to me.

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list