xf86-input-evdev: Changes to 'master'

Peter Hutterer peter.hutterer at who-t.net
Tue Feb 3 17:00:49 PST 2009


On Tue, Feb 03, 2009 at 04:50:17PM -0800, Dan Nicholson wrote:
> On Tue, Feb 3, 2009 at 4:39 PM, Peter Hutterer <peter.hutterer at who-t.net> wrote:
> > On Tue, Feb 03, 2009 at 05:35:49AM -0800, Dan Nicholson wrote:
> >> > applied the patch locally, ran make distcheck and it still fails. Am I doing
> >> > anything wrong?
> >> > AFAICT from a quick peek, ${includedir} isn't expanded. Can you double-check
> >> > this please?
> >>
> >> That part worked for me, but it does fail on ChangeLog somehow.
> >> ${includedir} gets expanded by make eventually. Look at the generated
> >> Makefile. All the derived directories like bindir are similar unless
> >> you've explicitly set it from configure. How is it failing for you?
> >
> > doh. you're right, same here, the changelog is the issue here too.
> > How about the diff below?
> > If that's the right thing, just merge it into your patch and re-send the
> > complete version. (I could do it locally, but I'd like to have the final
> > version of the patch on the list archives)
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index 54814c3..d7a5a65 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -33,6 +33,7 @@ pkgconfigdir = $(libdir)/pkgconfig
> >  pkgconfig_DATA = xorg-evdev.pc
> >
> >  EXTRA_DIST = ChangeLog
> > +DISTCLEANFILES = ChangeLog
> >
> >  MAINTAINERCLEANFILES=ChangeLog
> 
> Actually, I updated my macros, and now it's working.
> 
> http://cgit.freedesktop.org/xorg/util/macros/commit/?id=55e8d740881ef622376440819119641e67aeb285
> 
> I don't think we want ChangeLog in DISTCLEANFILES because then a user
> with the tarball will remove it on distclean. Not the end of the
> world, but it breaks the distclean notion of "get me back to the clean
> dist state".
> 
> Does that work for you?

yeah, updating works, thanks. Should we make macros 1.2.1 a requirement then?

Cheers,
  Peter



More information about the xorg mailing list