add INCLUDE_DIR variable for $(TOPDIR)/include

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 9fbbe45..fc62127 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/modules-$(KERNEL).mk
+include $(INCLUDE_DIR)/modules-$(KERNEL).mk
 
 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \

diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk
index 71864ad..553db03 100644 (file)
--- a/include/modules-2.4.mk
+++ b/include/modules-2.4.mk
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/netfilter.mk
+include $(INCLUDE_DIR)/netfilter.mk
 
 # Networking
 

diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk
index ec9f5da..aada707 100644 (file)
--- a/include/modules-2.6.mk
+++ b/include/modules-2.6.mk
@@ -1,5 +1,5 @@
 NF_2_6:=1
-include $(TOPDIR)/include/netfilter.mk
+include $(INCLUDE_DIR)/netfilter.mk
 
 # Networking
 

diff --git a/package/alsa/Makefile b/package/alsa/Makefile
index 5f6a330..7046bfe 100644 (file)
--- a/package/alsa/Makefile
+++ b/package/alsa/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=alsa-driver
 PKG_VERSION:=1.0.11
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(LINUX_KARCH),i386)
 KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index bb20894..7db0d05 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
@@ -12,7 +12,7 @@ ifeq ($(REV),)
 REV:=0
 endif
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
 TARGET:=-$(BOARD)-$(KERNEL)

diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index f2b178a..c3e682c 100644 (file)
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/bridge
 PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/bridge
 SECTION:=base

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 6fe22ed..7983943 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,7 +1,7 @@
 # $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
 PKG_VERSION:=4.80.9.2
@@ -14,7 +14,7 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=7d9fab2c611369bbe075c3924ea77450
 PKG_CAT:=bzcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-brcm-wl
   SECTION:=drivers

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 6b2e0c5..b444129 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads
 PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7
 PKG_CAT:=bzcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/busybox
 SECTION:=base

diff --git a/package/diag/Makefile b/package/diag/Makefile
index ab28e72..de6ab8d 100644 (file)
--- a/package/diag/Makefile
+++ b/package/diag/Makefile
@@ -1,14 +1,14 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kmod-diag
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-diag
 SECTION:=drivers

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index a05ec0e..09770da 100644 (file)
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 PKG_MD5SUM:=489198ec87101087043adc98bbe062dc
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/dnsmasq
 SECTION:=base

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 0409e66..b76d3da 100644 (file)
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
 PKG_MD5SUM:=ca8e53a766faec831882831364568421
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/dropbear
 SECTION:=base

diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 814ac68..87f93de 100644 (file)
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/ebtables
 PKG_MD5SUM:=f07111fcc1966be669278433c35dcc28
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/ebtables
 SECTION:=base

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index b708423..06777c8 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
 PKG_VERSION:=2.5.3
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-fuse
 SECTION:=drivers

diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index ec940ea..53a28a7 100644 (file)
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/haserl
 PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/haserl
 SECTION:=base

diff --git a/package/hostap/Makefile b/package/hostap/Makefile
index 21abfe2..612b2b7 100644 (file)
--- a/package/hostap/Makefile
+++ b/package/hostap/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=hostap-driver
 PKG_VERSION:=0.4.9
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-hostap
 SECTION:=drivers

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 867cda6..7fc77f8 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/hostapd
 SECTION:=net

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 9cf1eb9..bbbcc75 100644 (file)
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
 PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/ip
 SECTION:=base

diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 667884d..5567036 100644 (file)
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=bzcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/ipsec-tools
 SECTION:=base

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index d245090..0991148 100644 (file)
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://ipset.netfilter.org
 PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
 PKG_CAT:=bzcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/ipset
 SECTION:=base

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 7490277..f1a7de1 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.3.5
@@ -20,10 +20,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_MENU:=IPv4 / IPv6 firewall administration
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
 include $(LINUX_DIR)/.config
-include $(TOPDIR)/include/netfilter.mk
+include $(INCLUDE_DIR)/netfilter.mk
 endif
 
 define Package/iptables

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 2d7aecf..0ded09a 100644 (file)
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/libpcap
 SECTION:=base

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 15b3f7d..48a94ed 100644 (file)
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/linux-atm
 SECTION:=libs

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 7bdb7ec..57210c0 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi
 PKG_VERSION:=0.9.0
@@ -54,7 +54,7 @@ MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
                LDOPTS="" \
                DOMULTI=1
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(findstring AHB,$(BUS)),AHB)
 define Build/Compile/ahb

diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile
index 0180f81..2922908 100644 (file)
--- a/package/mini_fo/Makefile
+++ b/package/mini_fo/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mini_fo
 PKG_VERSION:=0.6.2pre1
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://www.denx.de/twiki/pub/Know/MiniFOHome/
 PKG_SOURCE:=mini_fo-0-6-2-pre1.tar.bz2
 PKG_CAT:=bzcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-mini-fo
 SECTION:=drivers

diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index 01dfcd6..80409a9 100644 (file)
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=4
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/mtd
 SECTION:=base

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index cf76c7c..11e8936 100644 (file)
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/nvram
 SECTION:=base

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 39fe6b4..78e17a2 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -20,7 +20,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/libopenssl
 SECTION:=base

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index f810965..61aefe4 100644 (file)
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
 PKG_VERSION:=2.4.5
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-openswan
 SECTION:=drivers

diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index 2c7b229..388b431 100644 (file)
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/pcmcia-cs
 SECTION:=base

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index edd9a5e..813b722 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/ppp
 SECTION:=net

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 6d01ce1..0478b4c 100644 (file)
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/pptpclient
 PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/pptp
 SECTION:=base

diff --git a/package/robocfg/Makefile b/package/robocfg/Makefile
index ca0f83d..8451ac5 100644 (file)
--- a/package/robocfg/Makefile
+++ b/package/robocfg/Makefile
@@ -8,7 +8,7 @@ PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/robocfg
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/robocfg
 SECTION:=base

diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index 057358b..5617693 100644 (file)
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=shfs
 PKG_VERSION:=0.35
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-shfs
 SECTION:=drivers

diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile
index 86233fc..001a64f 100644 (file)
--- a/package/spca5xx/Makefile
+++ b/package/spca5xx/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=spca5xx
 PKG_VERSION:=20060301
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 #FIXME: add proper dependency handling on kmod-usb-core & kmod-videodev packages
 define Package/kmod-spca5xx

diff --git a/package/switch/Makefile b/package/switch/Makefile
index cb5f346..befae34 100644 (file)
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@@ -1,14 +1,14 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kmod-switch
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-switch
 SECTION:=drivers

diff --git a/package/udev/Makefile b/package/udev/Makefile
index 5d39716..0156115 100644 (file)
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -19,7 +19,7 @@ PKG_CAT:=bzcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/udev
 SECTION:=base

diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile
index 6d003f6..6d9c739 100644 (file)
--- a/package/ueagle-atm/Makefile
+++ b/package/ueagle-atm/Makefile
@@ -1,7 +1,7 @@
 # $Id: Makefile 2767 2005-12-25 02:10:14Z wbx $
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ueagle-atm
 PKG_VERSION:=1.0d1
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 #FIXME: add dependency on kmod-usb-core
 define Package/kmod-ueagle-atm

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 673ade4..798e3c8 100644 (file)
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -16,7 +16,7 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/fdisk
 SECTION:=base

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 368d3eb..5f12058 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/wireless-tools
 SECTION:=base

diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile
index d5feede..e6ec27e 100644 (file)
--- a/package/wlcompat/Makefile
+++ b/package/wlcompat/Makefile
@@ -1,14 +1,14 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kmod-wlcompat
 PKG_RELEASE:=3
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-wlcompat
 SECTION:=drivers

diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile
index 1c79922..ba7308c 100644 (file)
--- a/package/zd1211/Makefile
+++ b/package/zd1211/Makefile
@@ -1,7 +1,7 @@
 # $Id: Makefile 3297 2006-03-02 23:42:52Z florian $
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=zd1211
 PKG_VERSION:=r69
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://zd1211.ath.cx/download/
 PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz
 PKG_CAT:=zcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 #FIXME: add proper dependency handling on kmod-usb-core packages
 define Package/kmod-zd1211

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 8e497c2..6c56062 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=bzcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/zlib
 SECTION:=base

diff --git a/rules.mk b/rules.mk
index 79807e0..3f96d32 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -46,6 +46,7 @@ TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 OPTIMIZE_FOR_CPU=$(ARCH)
 HOSTCC:=gcc
 BASE_DIR:=$(TOPDIR)
+INCLUDE_DIR:=$(TOPDIR)/include
 DL_DIR:=$(BASE_DIR)/dl
 BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)
 STAGING_DIR:=$(BASE_DIR)/staging_dir_$(ARCH)

diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile
index 96a3284..b338987 100644 (file)
--- a/target/linux/ar531x-2.4/Makefile
+++ b/target/linux/ar531x-2.4/Makefile
@@ -5,8 +5,8 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches

diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile
index c8688da..02a553a 100644 (file)
--- a/target/linux/ar7-2.4/Makefile
+++ b/target/linux/ar7-2.4/Makefile
@@ -5,7 +5,7 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 ATM_FIRMWARE_VERSION:=0.4
 ATM_FIRMWARE_DIR=sangam-atm-firmware-$(ATM_FIRMWARE_VERSION)
@@ -26,7 +26,7 @@ $(eval $(call KMOD_template,CPMAC,cpmac,\
        $(MODULES_DIR)/kernel/drivers/net/avalanche_cpmac/avalanche_cpmac.o \
 ,CONFIG_MIPS_AVALANCHE_CPMAC,,10,avalanche_cpmac))
 
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile
index 652e4b9..4d7955b 100644 (file)
--- a/target/linux/aruba-2.6/Makefile
+++ b/target/linux/aruba-2.6/Makefile
@@ -5,8 +5,8 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)

diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile
index b1ca0fe..a301fab 100644 (file)
--- a/target/linux/au1000-2.6/Makefile
+++ b/target/linux/au1000-2.6/Makefile
@@ -5,8 +5,8 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches

diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index 20a6210..7945db9 100644 (file)
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -5,7 +5,7 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 # broadcom specific kmod packages
 $(eval $(call KMOD_template,LP,lp,\
@@ -15,7 +15,7 @@ $(eval $(call KMOD_template,LP,lp,\
        $(MODULES_DIR)/kernel/drivers/char/ppdev.o \
 ,CONFIG_PARPORT,,50,parport parport_splink lp))
 
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile
index a3b8177..35a778f 100644 (file)
--- a/target/linux/brcm-2.6/Makefile
+++ b/target/linux/brcm-2.6/Makefile
@@ -5,8 +5,8 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile
index 4b22f90..a98f53e 100644 (file)
--- a/target/linux/image/ar7/Makefile
+++ b/target/linux/image/ar7/Makefile
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/image.mk
+include $(INCLUDE_DIR)/image.mk
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ar7loader
 

diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index 5091d3f..7c735b5 100644 (file)
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/image.mk
+include $(INCLUDE_DIR)/image.mk
 
 LOADADDR = 0x81000000          # RAM start + 16M 
 KERNEL_ENTRY = 0x80100000

diff --git a/target/linux/image/au1000/Makefile b/target/linux/image/au1000/Makefile
index 682670a..956d673 100644 (file)
--- a/target/linux/image/au1000/Makefile
+++ b/target/linux/image/au1000/Makefile
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/image.mk
+include $(INCLUDE_DIR)/image.mk
 
 LOADADDR = 0x8108c8f4          # RAM start + 16M 
 KERNEL_ENTRY = 0x80100000      # Default kernel entry in arch/mips/Makefile

diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile
index d219dc3..e4ccffd 100644 (file)
--- a/target/linux/image/brcm/Makefile
+++ b/target/linux/image/brcm/Makefile
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/image.mk
+include $(INCLUDE_DIR)/image.mk
 
 define Build/Compile
        rm -f $(KDIR)/loader.gz

diff --git a/target/linux/image/generic/Makefile b/target/linux/image/generic/Makefile
index b9efc95..a11574b 100644 (file)
--- a/target/linux/image/generic/Makefile
+++ b/target/linux/image/generic/Makefile
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/image.mk
+include $(INCLUDE_DIR)/image.mk
 
 # use default targets for everything
 

diff --git a/target/linux/image/rb532/Makefile b/target/linux/image/rb532/Makefile
index 53adfc4..b589f04 100644 (file)
--- a/target/linux/image/rb532/Makefile
+++ b/target/linux/image/rb532/Makefile
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/image.mk
+include $(INCLUDE_DIR)/image.mk
 
 LOADADDR = 0x81000000          # RAM start + 16M 
 KERNEL_ENTRY = 0x80101000

diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile
index d76294f..94d1dad 100644 (file)
--- a/target/linux/image/x86/Makefile
+++ b/target/linux/image/x86/Makefile
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/image.mk
+include $(INCLUDE_DIR)/image.mk
 
 define Image/Build
        cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img

diff --git a/target/linux/image/xscale/Makefile b/target/linux/image/xscale/Makefile
index d94d7f0..ba20370 100644 (file)
--- a/target/linux/image/xscale/Makefile
+++ b/target/linux/image/xscale/Makefile
@@ -1,4 +1,4 @@
-include $(TOPDIR)/include/image.mk
+include $(INCLUDE_DIR)/image.mk
 
 define Image/Build
 ifneq ($(FS),jffs2-64k)

diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile
index 4b09019..11e34e7 100644 (file)
--- a/target/linux/rb532-2.6/Makefile
+++ b/target/linux/rb532-2.6/Makefile
@@ -5,8 +5,8 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches

diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte-2.6/Makefile
index 4b09019..11e34e7 100644 (file)
--- a/target/linux/sibyte-2.6/Makefile
+++ b/target/linux/sibyte-2.6/Makefile
@@ -5,8 +5,8 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches

diff --git a/target/linux/x86-2.4/Makefile b/target/linux/x86-2.4/Makefile
index a6208db..8a690af 100644 (file)
--- a/target/linux/x86-2.4/Makefile
+++ b/target/linux/x86-2.4/Makefile
@@ -5,13 +5,13 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 $(eval $(call KMOD_template,WD1100,wd1100,\
        $(MODULES_DIR)/kernel/drivers/char/wd1100.o \
 ,CONFIG_WD1100))
 
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches

diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index ab88d58..04b13a3 100644 (file)
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -5,8 +5,8 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches

diff --git a/target/linux/xscale-2.6/Makefile b/target/linux/xscale-2.6/Makefile
index a4d93ef..bd17ba7 100644 (file)
--- a/target/linux/xscale-2.6/Makefile
+++ b/target/linux/xscale-2.6/Makefile
@@ -5,8 +5,8 @@ LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
 
 include ./config
-include $(TOPDIR)/include/kernel.mk
-include $(TOPDIR)/include/kernel-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches