From 7a75faf30a2d7549ef0434b0662f9938dc83da9b Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 6 Mar 2011 17:26:48 +0000 Subject: [PATCH] [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 --- utils/triggerhappy/Makefile | 1 - utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch diff --git a/utils/triggerhappy/Makefile b/utils/triggerhappy/Makefile index 2f22fb18e..e81d03e8c 100644 --- 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 index 000000000..13ecd8c48 --- /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 ' | $(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 + -- 2.11.0