From ca2fbbd111d882ce1ed58aa9198893ef162169b7 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 28 Mar 2010 21:55:54 +0000
Subject: [PATCH] propagate atm header changes into pppoatm and br2684ctl as
 well

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20558 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/br2684ctl/Makefile | 4 +++-
 package/ppp/Makefile       | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/br2684ctl/Makefile b/package/br2684ctl/Makefile
index 4de325ac8..4af040b4e 100644
--- a/package/br2684ctl/Makefile
+++ b/package/br2684ctl/Makefile
@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=br2684ctl
 PKG_VERSION:=20040226
@@ -15,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/b/br2684ctl
 PKG_MD5SUM:=6eb4d8cd174e24a7c078eb4f594f5b69
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 PKG_BUILD_DEPENDS:=linux-atm
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,6 +29,7 @@ define Package/$(PKG_NAME)
   URL:=http://ftp.debian.org/debian/pool/main/b/br2684ctl
 endef
 
+TARGET_CPPFLAGS += -I$(LINUX_DIR)/include
 MAKE_FLAGS += CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)"
 
 define Package/$(PKG_NAME)/install
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index b90fa4f2e..f8bfa48b6 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.4
@@ -20,7 +21,6 @@ PKG_BUILD_DEPENDS:=libpcap
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 define Package/ppp/Default
   SECTION:=net
@@ -108,6 +108,11 @@ $(call Build/Configure/Default,, \
 	UNAME_R="$(LINUX_VERSION)" \
 	UNAME_M="$(ARCH)" \
 )
+	mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
+	cp \
+		$(LINUX_DIR)/include/linux/compiler.h \
+		$(LINUX_DIR)/include/linux/atm*.h \
+		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
 endef
 
 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \