xserver distcheck broken with and without --disable-devel-docs

[Julien Cristau]

On Mon, Jan  3, 2011 at 14:06:37 +0000, Daniel Stone wrote:

> Hi,
> So, the DMX doc stuff breaks distcheck quite badly.  If I have
> --disable-devel-docs set in my ./configure run, I get:
> make[3]: Entering directory `/home/daniels/x/xorg/xserver/obj-amd64/hw/dmx/doc'
>   GEN    dmx.txt
>   GEN    scaled.txt
> make[3]: *** No rule to make target `html/annotated.html', needed by `distdir'.  Stop.
> make[3]: Leaving directory `/home/daniels/x/xorg/xserver/obj-amd64/hw/dmx/doc'
> make[2]: *** [distdir] Error 1
> 
> Without it (or shuffling around some if's in hw/dmx/doc/Makefile.am),
> I get:
>  (cd doc && make  top_distdir=../../../xorg-server-1.9.99.901 distdir=../../../xorg-server-1.9.99.901/hw/dmx/doc \
>      am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
> make[3]: Entering directory `/home/daniels/x/xorg/xserver/obj-amd64/hw/dmx/doc'
> /usr/bin/doxygen ../../../../hw/dmx/doc/doxygen.conf
> error: tag HTML_HEADER: header file `doxygen.head' does not exist
> make[3]: *** [html/annotated.html] Error 1
> make[3]: Leaving directory `/home/daniels/x/xorg/xserver/obj-amd64/hw/dmx/doc'
> 
> Can someone please take a look at this?
> 
Did this get resolved?  If not, can we please fix it before 1.10?

Cheers,
Julien