1From aef3d9bca4d77db833f71d50b1c84b16c69d7deb Mon Sep 17 00:00:00 2001
2From: "Yann E. MORIN" <yann.morin.1998@free.fr>
3Date: Sun, 23 Oct 2016 22:53:21 +0200
4Subject: [PATCH] build: get rid of sdkdir
5
6Use of sdkdir causes problems during cross-compilation, where the full
7path is then appended to the DESTDIR, leading to host paths being
8appended in the target:
9    https://bugs.busybox.net/show_bug.cgi?id=8696
10
11Other drivers (e.g. keyboard) got rid of sdkdir. Do the same.
12
13Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
14---
15 Makefile.am         |  3 ---
16 configure.ac        | 10 ----------
17 include/Makefile.am |  4 +++-
18 xorg-mouse.pc.in    |  3 +--
19 4 files changed, 4 insertions(+), 16 deletions(-)
20
21diff --git a/Makefile.am b/Makefile.am
22index 7142485..efe66cb 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -34,9 +34,6 @@ ChangeLog:
26
27 dist-hook: ChangeLog INSTALL
28
29-# Provide an sdk location that is writable by this module
30-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
31-
32 if LINT
33 # Check source code with tools like lint & sparse
34 lint:
35diff --git a/configure.ac b/configure.ac
36index 15d9047..515681d 100644
37--- a/configure.ac
38+++ b/configure.ac
39@@ -60,16 +60,6 @@ AC_ARG_WITH(xorg-module-dir,
40 inputdir=${moduledir}/input
41 AC_SUBST(inputdir)
42
43-# X Server SDK location is required to install xf86-mouse-properties.h
44-# This location is also relayed in the xorg-mouse.pc file
45-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
46-
47-# Workaround overriding sdkdir to be able to create a tarball when user has no
48-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
49-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
50-AC_SUBST([sdkdir])
51-
52-
53 # Work out which OS mouse driver we need to build
54 case $host_os in
55   linux*)
56diff --git a/include/Makefile.am b/include/Makefile.am
57index 27ce0fb..2b85e4e 100644
58--- a/include/Makefile.am
59+++ b/include/Makefile.am
60@@ -1 +1,3 @@
61-sdk_HEADERS = xf86-mouse-properties.h
62+# Location formerly known as 'sdkdir'
63+xorgincludedir = $(includedir)/xorg
64+xorginclude_HEADERS = xf86-mouse-properties.h
65diff --git a/xorg-mouse.pc.in b/xorg-mouse.pc.in
66index 57df596..8355e61 100644
67--- a/xorg-mouse.pc.in
68+++ b/xorg-mouse.pc.in
69@@ -1,6 +1,7 @@ prefix=@prefix@
70-sdkdir=@sdkdir@
71+prefix=@prefix@
72+includedir=@includedir@
73
74 Name: xorg-mouse
75 Description: X.Org mouse input driver for non-evdev OS'es
76 Version: @PACKAGE_VERSION@
77-Cflags: -I${sdkdir}
78+Cflags: -I${includedir}/xorg
79--
802.7.4
81
82