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