1From 1ad5e1593556f767150c2ca75176453bee4771e6 Mon Sep 17 00:00:00 2001
2From: "Yann E. MORIN" <yann.morin.1998@free.fr>
3Date: Sun, 23 Oct 2016 22:00:10 +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         |  4 ----
16 configure.ac        |  9 ---------
17 include/Makefile.am |  5 ++++-
18 xorg-evdev.pc.in    | 10 ++++++++--
19 4 files changed, 12 insertions(+), 16 deletions(-)
20
21diff --git a/Makefile.am b/Makefile.am
22index 1cc3ea6..1ae042a 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -18,10 +18,6 @@
26 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
27 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28
29-
30-# Provide an sdk location that is writable by the evdev module
31-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
32-
33 SUBDIRS = src man include
34 MAINTAINERCLEANFILES = ChangeLog INSTALL
35
36diff --git a/configure.ac b/configure.ac
37index e4887a3..4adfa43 100644
38--- a/configure.ac
39+++ b/configure.ac
40@@ -66,15 +66,6 @@ AC_ARG_WITH(xorg-conf-dir,
41             [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
42 AC_SUBST(xorgconfdir)
43
44-# X Server SDK location is required to install evdev header files
45-# This location is also relayed in the xorg-evdev.pc file
46-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
47-
48-# Workaround overriding sdkdir to be able to create a tarball when user has no
49-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
50-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
51-AC_SUBST([sdkdir])
52-
53 DRIVER_NAME=evdev
54 AC_SUBST([DRIVER_NAME])
55
56diff --git a/include/Makefile.am b/include/Makefile.am
57index 0e3fc1b..afc96ed 100644
58--- a/include/Makefile.am
59+++ b/include/Makefile.am
60@@ -1 +1,4 @@
61-sdk_HEADERS = evdev-properties.h
62+# location formerly known as 'sdkdir':
63+xorgincludedir = $(includedir)/xorg
64+
65+xorginclude_HEADERS = evdev-properties.h
66diff --git a/xorg-evdev.pc.in b/xorg-evdev.pc.in
67index 20710a6..fcbf511 100644
68--- a/xorg-evdev.pc.in
69+++ b/xorg-evdev.pc.in
70@@ -1,6 +1,12 @@
71-sdkdir=@sdkdir@
72+prefix=@prefix@
73+exec_prefix=@exec_prefix@
74+libdir=@libdir@
75+includedir=@includedir@
76+datarootdir=@datarootdir@
77+moduledir=@moduledir@
78+sysconfigdir=@sysconfigdir@
79
80 Name: xorg-evdev
81 Description: X.Org evdev input driver.
82 Version: @PACKAGE_VERSION@
83-Cflags: -I${sdkdir}
84+Cflags: -I${includedir}/xorg
85--
862.7.4
87
88