123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081 |
- From aef3d9bca4d77db833f71d50b1c84b16c69d7deb Mon Sep 17 00:00:00 2001
- From: "Yann E. MORIN" <yann.morin.1998@free.fr>
- Date: Sun, 23 Oct 2016 22:53:21 +0200
- Subject: [PATCH] build: get rid of sdkdir
- Use of sdkdir causes problems during cross-compilation, where the full
- path is then appended to the DESTDIR, leading to host paths being
- appended in the target:
- https://bugs.busybox.net/show_bug.cgi?id=8696
- Other drivers (e.g. keyboard) got rid of sdkdir. Do the same.
- Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
- ---
- Makefile.am | 3 ---
- configure.ac | 10 ----------
- include/Makefile.am | 4 +++-
- xorg-mouse.pc.in | 3 +--
- 4 files changed, 4 insertions(+), 16 deletions(-)
- diff --git a/Makefile.am b/Makefile.am
- index 7142485..efe66cb 100644
- --- a/Makefile.am
- +++ b/Makefile.am
- @@ -34,9 +34,6 @@ ChangeLog:
-
- dist-hook: ChangeLog INSTALL
-
- -# Provide an sdk location that is writable by this module
- -DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
- -
- if LINT
- # Check source code with tools like lint & sparse
- lint:
- diff --git a/configure.ac b/configure.ac
- index 15d9047..515681d 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -60,16 +60,6 @@ AC_ARG_WITH(xorg-module-dir,
- inputdir=${moduledir}/input
- AC_SUBST(inputdir)
-
- -# X Server SDK location is required to install xf86-mouse-properties.h
- -# This location is also relayed in the xorg-mouse.pc file
- -sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
- -
- -# Workaround overriding sdkdir to be able to create a tarball when user has no
- -# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
- -AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
- -AC_SUBST([sdkdir])
- -
- -
- # Work out which OS mouse driver we need to build
- case $host_os in
- linux*)
- diff --git a/include/Makefile.am b/include/Makefile.am
- index 27ce0fb..2b85e4e 100644
- --- a/include/Makefile.am
- +++ b/include/Makefile.am
- @@ -1 +1,3 @@
- -sdk_HEADERS = xf86-mouse-properties.h
- +# Location formerly known as 'sdkdir'
- +xorgincludedir = $(includedir)/xorg
- +xorginclude_HEADERS = xf86-mouse-properties.h
- diff --git a/xorg-mouse.pc.in b/xorg-mouse.pc.in
- index 57df596..8355e61 100644
- --- a/xorg-mouse.pc.in
- +++ b/xorg-mouse.pc.in
- @@ -1,6 +1,7 @@ prefix=@prefix@
- -sdkdir=@sdkdir@
- +prefix=@prefix@
- +includedir=@includedir@
-
- Name: xorg-mouse
- Description: X.Org mouse input driver for non-evdev OS'es
- Version: @PACKAGE_VERSION@
- -Cflags: -I${sdkdir}
- +Cflags: -I${includedir}/xorg
- --
- 2.7.4
|