From: John Crispin <john@openwrt.org>
Date: Sun, 16 Dec 2012 11:04:27 +0000 (+0000)
Subject: fixes uapi helper define
X-Git-Tag: reboot~11943
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e9c0b958295bb055fefc03b1e356051f99218f28;p=openwrt%2Fstaging%2Fchunkeey.git

fixes uapi helper define

SVN-Revision: 34715
---

diff --git a/include/kernel.mk b/include/kernel.mk
index eabf9484fa..6185237765 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -35,8 +35,9 @@ else
   endif
   KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))
   LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
-  LINUX_UAPI_DIR=$(firstword $(wildcard $(LINUX_DIR)/include/uapi $(LINUX_DIR)/include))
-
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
+    LINUX_UAPI_DIR=uapi/
+  endif
   LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null))
   LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown)
 
diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 49c6a40a4c..71c598196b 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -158,7 +158,7 @@ $(call Build/Configure/Default,, \
 	mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
 	cp \
 		$(LINUX_DIR)/include/linux/compiler.h \
-		$(LINUX_UAPI_DIR)/linux/atm*.h \
+		$(LINUX_DIR)/include/$(LINUX_UAPI_DIR)linux/atm*.h \
 		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
 endef