triggerhappy: fix determination of input.h, remove explicit override (#8990)

SVN-Revision: 25890

diff --git a/utils/triggerhappy/Makefile b/utils/triggerhappy/Makefile
index 2f22fb18e42f9eb3befa5aa72f1ce71ecbf6c61c..e81d03e8c0610f3658f768def5fc1c5f3cb82d71 100644 (file)
--- a/utils/triggerhappy/Makefile
+++ b/utils/triggerhappy/Makefile
@@ -32,7 +32,6 @@ define Package/triggerhappy/description
 endef
 
 MAKE_FLAGS += \
-       LINUX_INPUT_H=$(TOOLCHAIN_DIR)/usr/include/linux/input.h \
        $(TARGET_CONFIGURE_OPTS) \
        $(1)
 

diff --git a/utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch b/utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch
new file mode 100644 (file)
index 0000000..13ecd8c
--- /dev/null
+++ b/utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,7 @@ THCMD_COMPS := th-cmd cmdsocket
+ 
+ MAKEDEPEND = $(CC) -M -MG $(CPPFLAGS) -o $*.d $<
+ 
+-LINUX_INPUT_H := $(shell echo '\#include <linux/input.h>' | $(CC) $(CPPFLAGS) -M -E - | awk 'NR==1 {print $$2}')
++LINUX_INPUT_H := $(shell for i in `echo | $(CC) $(CPPFLAGS) -M -E -include 'linux/input.h' -`; do test -f "$$i" && echo "$$i" && break; done)
+ 
+ all: thd th-cmd man
+