1*4882a593SmuzhiyunFrom 1b2cf6e6c2640e08166af36eee775542a45325af Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: "Yann E. MORIN" <yann.morin.1998@free.fr> 3*4882a593SmuzhiyunDate: Sun, 23 Oct 2016 22:36:40 +0200 4*4882a593SmuzhiyunSubject: [PATCH] build: get rid of sdkdir 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUse of sdkdir causes problems during cross-compilation, where the full 7*4882a593Smuzhiyunpath is then appended to the DESTDIR, leading to host paths being 8*4882a593Smuzhiyunappended in the target: 9*4882a593Smuzhiyun https://bugs.busybox.net/show_bug.cgi?id=8696 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunOther drivers (e.g. keyboard) got rid of sdkdir. Do the same. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun Makefile.am | 2 -- 16*4882a593Smuzhiyun configure.ac | 8 -------- 17*4882a593Smuzhiyun include/Makefile.am | 4 +++- 18*4882a593Smuzhiyun xorg-libinput.pc.in | 5 +++-- 19*4882a593Smuzhiyun 4 files changed, 6 insertions(+), 13 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/Makefile.am b/Makefile.am 22*4882a593Smuzhiyunindex a447d61..7aa5523 100644 23*4882a593Smuzhiyun--- a/Makefile.am 24*4882a593Smuzhiyun+++ b/Makefile.am 25*4882a593Smuzhiyun@@ -19,8 +19,6 @@ 26*4882a593Smuzhiyun # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' 30*4882a593Smuzhiyun- 31*4882a593Smuzhiyun SUBDIRS = src include man test 32*4882a593Smuzhiyun MAINTAINERCLEANFILES = ChangeLog INSTALL 33*4882a593Smuzhiyun 34*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 35*4882a593Smuzhiyunindex 9894817..fe198cb 100644 36*4882a593Smuzhiyun--- a/configure.ac 37*4882a593Smuzhiyun+++ b/configure.ac 38*4882a593Smuzhiyun@@ -63,14 +63,6 @@ AC_ARG_WITH(xorg-conf-dir, 39*4882a593Smuzhiyun [xorgconfdir='${prefix}/share/X11/xorg.conf.d']) 40*4882a593Smuzhiyun AC_SUBST(xorgconfdir) 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun-# X Server SDK location is required to install header files 43*4882a593Smuzhiyun-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` 44*4882a593Smuzhiyun- 45*4882a593Smuzhiyun-# Workaround overriding sdkdir to be able to create a tarball when user has no 46*4882a593Smuzhiyun-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am 47*4882a593Smuzhiyun-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) 48*4882a593Smuzhiyun-AC_SUBST([sdkdir]) 49*4882a593Smuzhiyun- 50*4882a593Smuzhiyun DRIVER_NAME=libinput 51*4882a593Smuzhiyun AC_SUBST([DRIVER_NAME]) 52*4882a593Smuzhiyun 53*4882a593Smuzhiyundiff --git a/include/Makefile.am b/include/Makefile.am 54*4882a593Smuzhiyunindex 0d52b9b..271ffac 100644 55*4882a593Smuzhiyun--- a/include/Makefile.am 56*4882a593Smuzhiyun+++ b/include/Makefile.am 57*4882a593Smuzhiyun@@ -1 +1,3 @@ 58*4882a593Smuzhiyun-sdk_HEADERS = libinput-properties.h 59*4882a593Smuzhiyun+# Location formerly known as 'sdkdir' 60*4882a593Smuzhiyun+xorgincludedir = $(includedir)/xorg 61*4882a593Smuzhiyun+xorginclude_HEADERS = libinput-properties.h 62*4882a593Smuzhiyundiff --git a/xorg-libinput.pc.in b/xorg-libinput.pc.in 63*4882a593Smuzhiyunindex ff98189..9c0f506 100644 64*4882a593Smuzhiyun--- a/xorg-libinput.pc.in 65*4882a593Smuzhiyun+++ b/xorg-libinput.pc.in 66*4882a593Smuzhiyun@@ -1,6 +1,7 @@ 67*4882a593Smuzhiyun-sdkdir=@sdkdir@ 68*4882a593Smuzhiyun+prefix=@prefix@ 69*4882a593Smuzhiyun+includedir=@includedir@ 70*4882a593Smuzhiyun 71*4882a593Smuzhiyun Name: xorg-libinput 72*4882a593Smuzhiyun Description: X.Org libinput input driver. 73*4882a593Smuzhiyun Version: @PACKAGE_VERSION@ 74*4882a593Smuzhiyun-Cflags: -I${sdkdir} 75*4882a593Smuzhiyun+Cflags: -I${includedir}/xorg 76*4882a593Smuzhiyun-- 77*4882a593Smuzhiyun2.7.4 78*4882a593Smuzhiyun 79