[PATCH 09/10] xf86-input-acecad: Simplify value of $sdkdir.

Paulo César Pereira de Andrade pcpa at mandriva.com.br
Fri Feb 13 11:09:54 PST 2009


Dan Nicholson wrote:

>>  When setting the variable value using `pkg-config --variable`
>> it causes make distcheck to fail, and needing to circunvent the
>> problem by adding a configure option.
>
> If you want to make this change, then do it in the other drivers, too.

  That's why this patch was a "proposed pattern" for changes in
other packages. (But I am posting only this one, don't be afraid
of having 1k patches in your inbox by tomorrow :-))

> It doesn't make a big difference to me, but it should be consistent.
> However, acecad (and most of the drivers) doesn't actually use sdkdir.
> Only the drivers that install headers (evdev, synaptics?) care about
> sdkdir. So, you can just nuke it here.

  It is being AC_SUBST'ed gratuitously here indeed. Only the drivers
with properties are installing sdk headers (I think evdev, synaptics
and joystick).

>>  This solution should be significantly cleaner, but a macro
>> in xorg-server.m4 could be a better approach, as it would be
>> required to change only that file once macros are used in
>> drivers.
>
> The macro in xorg-server.m4 would cause exactly the same problem as
> using pkg-config. The issue is that distcheck expects that all
> installed files will respect --prefix and install under that
> directory. If you install to an externally defined location (sdkdir
> from pkg-config or xorg-server.m4) then you cannot guarantee this
> condition.

  But a macro, unlike a call to pkg-config should be able to do it,
as it can expand the proper "automake" code, (untested) example:
AC_DEFUN([XORG_DIRS], [
  sdkdir=${includedir}/xorg
  moduledir=${libdir}/xorg/modules
  AC_SUBST([sdkdir])
  AC_SUBST([moduledir])
])

  May require some small updates, better name, (at least testing :-)
but should do it...

> --
> Dan

Paulo



More information about the xorg-devel mailing list