1From 2826691dcd01f470d30dc8eb3bbd24a96cd3a93c Mon Sep 17 00:00:00 2001
2From: "Yann E. MORIN" <yann.morin.1998@free.fr>
3Date: Sun, 23 Oct 2016 22:29:29 +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         | 1 -
16 configure.ac        | 9 ---------
17 include/Makefile.am | 5 ++++-
18 xorg-joystick.pc.in | 2 +-
19 4 files changed, 5 insertions(+), 12 deletions(-)
20
21diff --git a/Makefile.am b/Makefile.am
22index 13946b8..c1567ae 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -18,7 +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-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir=\$${includedir}/xorg
30 SUBDIRS = src man config include
31 MAINTAINERCLEANFILES = ChangeLog INSTALL
32
33diff --git a/configure.ac b/configure.ac
34index b5834a5..44b9d27 100644
35--- a/configure.ac
36+++ b/configure.ac
37@@ -66,15 +66,6 @@ AC_ARG_WITH(xorg-module-dir,
38 inputdir=${moduledir}/input
39 AC_SUBST(inputdir)
40
41-# Define a configure option for an alternate X Server SDK Headers
42-# X Server SDK location is required to install joystick header files
43-AC_ARG_WITH(sdkdir,
44-            AS_HELP_STRING([--with-sdkdir=<path>],
45-                           [Xorg X Server sdk headers (default is autodetected)]),
46-            [sdkdir="$withval"],
47-            [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`])
48-AC_SUBST(sdkdir)
49-
50 # Define a configure option to enable code debugging
51 AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug],
52                                     [Disable debugging code (default: enabled)]),
53diff --git a/include/Makefile.am b/include/Makefile.am
54index ed618c2..d656568 100644
55--- a/include/Makefile.am
56+++ b/include/Makefile.am
57@@ -18,4 +18,7 @@
58 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
59 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
60
61-sdk_HEADERS = joystick-properties.h
62+# Location formerly known as 'sdkdir'
63+xorgincludedir = $(includedir)/xorg
64+
65+xorginclude_HEADERS = joystick-properties.h
66diff --git a/xorg-joystick.pc.in b/xorg-joystick.pc.in
67index 76bb92f..a5972c7 100644
68--- a/xorg-joystick.pc.in
69+++ b/xorg-joystick.pc.in
70@@ -4,4 +4,4 @@ includedir=@includedir@
71 Name: xorg-joystick
72 Description: X.Org joystick input driver.
73 Version: @PACKAGE_VERSION@
74-Cflags: -I${includedir}
75+Cflags: -I${includedir}/xorg
76--
772.7.4
78
79