On Wed, 2010-07-07 at 11:20 -0700, Alan Coopersmith wrote: > Gaetan Nadon wrote: > > On Fri, 2010-06-25 at 17:23 -0700, Alan Coopersmith wrote: > >> +STYLESHEET_SRCDIR = $(XORG_SGML_PATH)/X11 > >> +XSL_STYLESHEET = $(STYLESHEET_SRCDIR)/xorg.xsl > >> > > Now that util-macros 1.10 is released: > > > > > > doc/xml/xmlrules.in:43: STYLESHEET_SRCDIR was already defined in > > condition TRUE, which includes condition HAVE_DOCBOOK_STYLESHEETS ... > > doc/xml/Makefile.am:26: `doc/xml/xmlrules.in' included from here > > configure.ac:41: ... `STYLESHEET_SRCDIR' previously defined here > [...] > > > > The attached modified patch would fix it. > > Thanks - I'd made the patch before you'd pushed util-macros 1.10 and > hadn't gone back to update since. I've updated and resent the patch > with your suggested changes applied - I'm still looking for > Reviewed-by: tags for the series of 3 doc patches. >
1) In both xml and sgml, running make always copies xorg.css (over and over again) 2) unrelated to this patch, xmlrules.in uses abs_top_builddir which is not defined in automake 1.9, our lowest common denominator. $(top_builddir) should do. It passed distcheck. Tested-by: Gaetan Nadon <[email protected]> I'll look for the other patches
signature.asc
Description: This is a digitally signed message part
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
