[PATCH xf86-input-synaptics] build: apply the distcheck tricks used in xf86-input-evdev

[Peter Hutterer]

On Wed, May 25, 2011 at 06:16:22PM +0200, Diego Elio Pettenò wrote:
> With this change it is possible to complete "make distcheck" safely on the
> module, as it no longer tries to write to system directories.
> 
> Since synaptics also installs a configuration file, xorg-conf-dir also
> needs to be overridden during distcheck.
> ---
>  Makefile.am  |    6 ++++++
>  configure.ac |    5 +++++
>  2 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 07cb902..e94fe19 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -18,6 +18,12 @@
>  #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
>  #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>  
> +# During distcheck, system locations (as provided by pkg-config) are
> +# not writable; provide instead relative locations.
> +DISTCHECK_CONFIGURE_FLAGS = \
> +	--with-sdkdir='$${includedir}/xorg' \
> +	--with-xorg-conf-dir='$${sysconfdir}/xorg'
> +
>  MAINTAINERCLEANFILES = ChangeLog INSTALL
>  
>  pkgconfigdir = $(libdir)/pkgconfig
> diff --git a/configure.ac b/configure.ac
> index 855092b..4dd31f9 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -146,6 +146,11 @@ if test "x$have_libxtst" = "xyes" ; then
>  fi
>  dnl -----------------------------------------------------------------------------
>  
> +dnl Workaround overriding sdkdir to be able to create a tarball when user has no
> +dnl write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
> +AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
> +AC_SUBST([sdkdir])
> +
>  AC_CONFIG_FILES([Makefile
>                  xorg-synaptics.pc])
>  AC_OUTPUT
> -- 
> 1.7.5.rc3

merged thanks.  please reply to this patch with your Signed-off-by though 
http://wiki.x.org/wiki/Development/Documentation/SubmittingPatches

dnl changed to # since the second patch didn't get merged yet.

Cheers,
  Peter