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


git-svn-id: svn://svn.openwrt.org/openwrt/packages@25890 3c298f89-4303-0410-b956-a3cf2f4a3e73

--- a/utils/triggerhappy/Makefile
+++ b/utils/triggerhappy/Makefile
@@ -32,7 +32,6 @@
 endef
 
 MAKE_FLAGS += \
-	LINUX_INPUT_H=$(TOOLCHAIN_DIR)/usr/include/linux/input.h \
 	$(TARGET_CONFIGURE_OPTS) \
 	$(1)
 

--- /dev/null
+++ b/utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch
@@ -1,1 +1,12 @@
+--- 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
+ 
 

comments