From 23487d9434797944e0ad11214357049fdd726837 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 5 Aug 2008 22:04:10 +0000
Subject: [PATCH] Makefile cleanups, round 6 and last

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12175 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/aircrack-ng/Makefile        | 3 ---
 net/aircrack-ptw/Makefile       | 3 ---
 net/amwall/Makefile             | 3 ---
 net/asterisk-prompt-de/Makefile | 1 -
 net/batman-advanced/Makefile    | 1 -
 net/batman/Makefile             | 1 -
 net/bind/Makefile               | 3 ---
 net/bitchx/Makefile             | 1 -
 net/bmxd/Makefile               | 1 -
 net/chillispot/Makefile         | 2 --
 net/click/Makefile              | 3 ---
 net/crowdcontrol/Makefile       | 3 ---
 net/cups/Makefile               | 3 ---
 net/dhcp-forwarder/Makefile     | 3 ---
 net/dhcp/Makefile               | 3 ---
 net/dhcpcd/Makefile             | 3 ---
 net/dircproxy/Makefile          | 3 ---
 net/dsniff/Makefile             | 1 -
 net/freeradius/Makefile         | 3 ---
 net/iodine/Makefile             | 3 ---
 net/iptables-snmp/Makefile      | 3 ---
 net/knock/Makefile              | 3 ---
 net/l2tpd/Makefile              | 1 -
 net/matrixtunnel/Makefile       | 1 -
 net/miau/Makefile               | 3 ---
 net/mii-tool/Makefile           | 3 ---
 net/miniupnpd/Makefile          | 3 ---
 net/mvprelay/Makefile           | 3 ---
 net/n2n/Makefile                | 1 -
 net/netcat/Makefile             | 3 ---
 net/netstat-nat/Makefile        | 3 ---
 net/nfs-kernel-server/Makefile  | 1 -
 net/nfs-server/Makefile         | 3 ---
 net/ngircd/Makefile             | 3 ---
 net/ngrep/Makefile              | 3 ---
 net/nocatsplash/Makefile        | 1 -
 net/nufw/Makefile               | 3 ---
 net/olsrd/Makefile              | 2 --
 net/opendchub/Makefile          | 3 ---
 net/openser/Makefile            | 3 ---
 net/openssh/Makefile            | 2 --
 net/openvpn/Makefile            | 3 ---
 net/pptpd/Makefile              | 3 ---
 net/privoxy/Makefile            | 1 -
 net/ptunnel/Makefile            | 3 ---
 net/qolyester/Makefile          | 2 --
 net/quagga/Makefile             | 3 ---
 net/raddump/Makefile            | 3 ---
 net/rarpd/Makefile              | 3 ---
 net/reaim/Makefile              | 3 ---
 net/rp-l2tp/Makefile            | 3 ---
 net/samba/Makefile              | 2 --
 net/scanlogd/Makefile           | 3 ---
 net/scdp/Makefile               | 3 ---
 net/ser2net/Makefile            | 3 ---
 net/shat/Makefile               | 3 ---
 net/siproxd/Makefile            | 5 +----
 net/sipsak/Makefile             | 3 ---
 net/slurm/Makefile              | 3 ---
 net/snort-wireless/Makefile     | 3 ---
 net/snort/Makefile              | 3 ---
 net/squid/Makefile              | 3 ---
 net/sscep/Makefile              | 1 -
 net/tcpdump/Makefile            | 3 ---
 net/tinc/Makefile               | 3 ---
 net/tinyproxy/Makefile          | 3 ---
 net/tsocks/Makefile             | 3 ---
 net/ulogd/Makefile              | 3 ---
 net/uob-nomad/Makefile          | 3 ---
 net/vgp/Makefile                | 3 ---
 net/wccpd/Makefile              | 3 ---
 71 files changed, 1 insertion(+), 183 deletions(-)

diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile
index 08e32d09e..4f7085563 100644
--- a/net/aircrack-ng/Makefile
+++ b/net/aircrack-ng/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.aircrack-ng.org/
 PKG_MD5SUM:=07488ff1e178b5b7fe04c6fd78da2b96
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/aircrack-ng
diff --git a/net/aircrack-ptw/Makefile b/net/aircrack-ptw/Makefile
index 6ea4235e3..2007cc00d 100644
--- a/net/aircrack-ptw/Makefile
+++ b/net/aircrack-ptw/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.cdc.informatik.tu-darmstadt.de/aircrack-ptw/download
 PKG_MD5SUM:=1d7d84d1e69189bc1397db3f565c183a
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/aircrack-ptw
diff --git a/net/amwall/Makefile b/net/amwall/Makefile
index f128f26a1..abbeeb08d 100644
--- a/net/amwall/Makefile
+++ b/net/amwall/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/
 PKG_MD5SUM:=a8b6438e7fd9ccadc9f68824ae62349c
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/amwall
diff --git a/net/asterisk-prompt-de/Makefile b/net/asterisk-prompt-de/Makefile
index d4e2899fb..f4b102b44 100644
--- a/net/asterisk-prompt-de/Makefile
+++ b/net/asterisk-prompt-de/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://www.stadt-pforzheim.de/asterisk/dateien/
 PKG_MD5SUM:=d263b0b746acf84d7519ff8fb6699dc8
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ast_prompts_de_v2_0
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index 17534b32c..787ffcde5 100644
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -20,7 +20,6 @@ PKG_SOURCE_SUBDIR:=batman-adv-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv-kernelland/batman-core
 
diff --git a/net/batman/Makefile b/net/batman/Makefile
index a0350b73c..2c227a929 100644
--- a/net/batman/Makefile
+++ b/net/batman/Makefile
@@ -21,7 +21,6 @@ PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),$(PKG_NAME))-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/$(if $(PKG_BRANCH),tags/$(PKG_BRANCH),trunk/batman/)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/linux/modules
 
diff --git a/net/bind/Makefile b/net/bind/Makefile
index dbd5f9a32..c3d5065cf 100644
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:= \
 	http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION)
 PKG_MD5SUM:=a4f9dd6d205d24ec89fa4e44d8188197
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bind/Default
diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile
index c0310f716..09711cbbe 100644
--- a/net/bitchx/Makefile
+++ b/net/bitchx/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://bitchx.org/files/source/
 PKG_MD5SUM:=611d2dda222f00c10140236f4c331572
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/BitchX
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DEPENDS:=libncurses
 
diff --git a/net/bmxd/Makefile b/net/bmxd/Makefile
index 42545ac09..62727c3d0 100644
--- a/net/bmxd/Makefile
+++ b/net/bmxd/Makefile
@@ -20,7 +20,6 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile
index e4d2a98f2..1a46a6458 100644
--- a/net/chillispot/Makefile
+++ b/net/chillispot/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.chillispot.org/download
 PKG_MD5SUM:=9d2597756af3fa14d7331b4a3651fc9b
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/click/Makefile b/net/click/Makefile
index 912548d99..87361af10 100644
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -17,9 +17,6 @@ ROOFNET_VERSION:=0.0.1
 PKG_SOURCE_URL:=http://pdos.csail.mit.edu/~jbicket/click_snapshots/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/click
diff --git a/net/crowdcontrol/Makefile b/net/crowdcontrol/Makefile
index ddc49dfbf..a1e95911e 100644
--- a/net/crowdcontrol/Makefile
+++ b/net/crowdcontrol/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=a0991ae3d1f1a361558bed1a4aa66a9c
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/crowdcontrol
diff --git a/net/cups/Makefile b/net/cups/Makefile
index 20ded7c6d..d60331aa9 100644
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE_URL:= \
 	ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION)
 PKG_MD5SUM:=4ce09b1dce09b6b9398af0daae9adf63
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=zlib
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile
index 24f68d04b..af05d69ec 100644
--- a/net/dhcp-forwarder/Makefile
+++ b/net/dhcp-forwarder/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd
 PKG_MD5SUM:=e7f876e615ebc3f96418f6477b4451e2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_ARGS += \
diff --git a/net/dhcp/Makefile b/net/dhcp/Makefile
index ba77fa776..944324465 100644
--- a/net/dhcp/Makefile
+++ b/net/dhcp/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/dhcp/
 PKG_MD5SUM:=27d179a3c3fbef576566b456a1168246
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dhcp/Default
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index ae4122f3b..525c11119 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://download.berlios.de/dhcpcd/
 PKG_MD5SUM:=e9100e53f64ca1f9fb0d392c3a623738
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dhcpcd
diff --git a/net/dircproxy/Makefile b/net/dircproxy/Makefile
index 41e1bcd44..b0495afbe 100644
--- a/net/dircproxy/Makefile
+++ b/net/dircproxy/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz
 PKG_SOURCE_URL:=http://dircproxy.securiweb.net/pub/1.2/
 PKG_MD5SUM:=850443437f709276ff21a173bbf98456
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dircproxy
diff --git a/net/dsniff/Makefile b/net/dsniff/Makefile
index a4bb626e1..98b69462d 100644
--- a/net/dsniff/Makefile
+++ b/net/dsniff/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://www.monkey.org/~dugsong/dsniff/beta
 PKG_MD5SUM:=2f761fa3475682a7512b0b43568ee7d6
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2.4
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index ecdb2baa7..e603cb25b 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/old/ \
 	ftp://ftp.uk.freeradius.org/pub/radius/
 PKG_MD5SUM:=2c29ab90cc30aa3b92fbd78030ccc198
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/freeradius/Default
diff --git a/net/iodine/Makefile b/net/iodine/Makefile
index 747189ab1..008c0850e 100644
--- a/net/iodine/Makefile
+++ b/net/iodine/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://code.kryo.se/iodine/
 PKG_MD5SUM:=58d82bca11a41a01d0ddfa7d105e6a48
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iodine/Default
diff --git a/net/iptables-snmp/Makefile b/net/iptables-snmp/Makefile
index c6bc21672..96ec9cfc9 100644
--- a/net/iptables-snmp/Makefile
+++ b/net/iptables-snmp/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.nobiscuit.com/iptables-snmp
 PKG_MD5SUM:=8370d2f0c899461a053da491400119d1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iptables-snmp
diff --git a/net/knock/Makefile b/net/knock/Makefile
index d9fbbe6ba..4a5375c0a 100644
--- a/net/knock/Makefile
+++ b/net/knock/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.zeroflux.org/knock/files/
 PKG_MD5SUM:=ca09d61458974cff90a700aba6120891
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/knock/Default
diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile
index f0bbbbd39..1bd5af83b 100644
--- a/net/l2tpd/Makefile
+++ b/net/l2tpd/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/l2tpd
 PKG_MD5SUM:=3f2707b6e16a8cb72e7bf64f574202fa
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).orig
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/matrixtunnel/Makefile b/net/matrixtunnel/Makefile
index b37822767..9e00bb322 100644
--- a/net/matrixtunnel/Makefile
+++ b/net/matrixtunnel/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://znerol.ch/files
 PKG_MD5SUM:=af169751efc7d87d500716a48d74ddc5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/miau/Makefile b/net/miau/Makefile
index 376f813b1..192b0443f 100644
--- a/net/miau/Makefile
+++ b/net/miau/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/miau
 PKG_MD5SUM:=cbce4182d66430a965a5fff26738ce3f
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/miau
diff --git a/net/mii-tool/Makefile b/net/mii-tool/Makefile
index 53cc9bbbc..6c0c60a64 100644
--- a/net/mii-tool/Makefile
+++ b/net/mii-tool/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://freshmeat.net/redir/mii-tool/59072/url_bz2/
 PKG_MD5SUM:=f65dbeb1c2392acffd4c94138b1f2e52
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mii-tool
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 6f05c3cff..d0d0e456d 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -16,9 +16,6 @@ PKG_MD5SUM:=a0f6651476721db9b554668c8c83b151
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/miniupnpd
diff --git a/net/mvprelay/Makefile b/net/mvprelay/Makefile
index 2f29428aa..10ff2b638 100644
--- a/net/mvprelay/Makefile
+++ b/net/mvprelay/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=189fb792470c966834d5204705ebee83
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mvprelay
diff --git a/net/n2n/Makefile b/net/n2n/Makefile
index a1172b9ef..32b8fe12d 100644
--- a/net/n2n/Makefile
+++ b/net/n2n/Makefile
@@ -20,7 +20,6 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index f79e594ce..4354a978b 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -8,9 +8,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=0a29eff1736ddb5effd0b1ec1f6fe0ef
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netcat
diff --git a/net/netstat-nat/Makefile b/net/netstat-nat/Makefile
index 76d8ca71b..e7621c7c5 100644
--- a/net/netstat-nat/Makefile
+++ b/net/netstat-nat/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://tweegy.demon.nl/download/
 PKG_MD5SUM:=ccf71a6cbd9a513ea3adec54b54ee770
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netstat-nat
diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index 751996af1..f02dd3c5a 100644
--- a/net/nfs-kernel-server/Makefile
+++ b/net/nfs-kernel-server/Makefile
@@ -11,7 +11,6 @@ PKG_SOURCE_URL:=@SF/nfs
 PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.gz
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/nfs-utils-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/nfs-server/Makefile b/net/nfs-server/Makefile
index ef2af4a3a..99058ab4f 100644
--- a/net/nfs-server/Makefile
+++ b/net/nfs-server/Makefile
@@ -16,9 +16,6 @@ PKG_MD5SUM:=79a29fe9f79b2f3241d4915767b8c511
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/n/nfs-user-server
 PKG_SOURCE:=nfs-user-server_$(PKG_VERSION).orig.tar.gz
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nfs-server
diff --git a/net/ngircd/Makefile b/net/ngircd/Makefile
index a44af019f..bf7be2465 100644
--- a/net/ngircd/Makefile
+++ b/net/ngircd/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ngircd.barton.de/pub/ngircd/
 PKG_MD5SUM:=db8618877a4dd5fb2be50402a2cb4a14
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ngircd
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index f7add59f3..c2c3edb1a 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ngrep
 PKG_MD5SUM:=bc8150331601f3b869549c94866b4f1c
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ngrep
diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile
index 0c8143d7c..223196e7a 100644
--- a/net/nocatsplash/Makefile
+++ b/net/nocatsplash/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://wifi.rulez.org/~josephus/
 PKG_MD5SUM:=e0fcc0effe52e63bc31070d16d0b4a81
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/NoCatSplash-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/nufw/Makefile b/net/nufw/Makefile
index 29f428a89..258b8db13 100644
--- a/net/nufw/Makefile
+++ b/net/nufw/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.nufw.org/download/nufw/
 PKG_MD5SUM:=ef9d335c2db263d85541379db7871f65
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nufw/Default
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index cc7c10440..6f3e37289 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
 PKG_MD5SUM:=10fbf796792d51eda735d171b6c86941
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/olsrd/template
diff --git a/net/opendchub/Makefile b/net/opendchub/Makefile
index 2ae0e4d72..1ef4bc45d 100644
--- a/net/opendchub/Makefile
+++ b/net/opendchub/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/opendchub
 PKG_MD5SUM:=8f9ab5bb7f85730f4b1ce7cceb6aef96
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/opendchub
diff --git a/net/openser/Makefile b/net/openser/Makefile
index b74233743..c03932d09 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -18,9 +18,6 @@ PKG_VARIANT:=
 PKG_SOURCE_URL:=http://openser.org/pub/openser/$(PKG_VERSION)/src
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openser
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index ec0ae9c4d..e6c8ea485 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -20,8 +20,6 @@ PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/
 PKG_MD5SUM:=1f1dfaa775f33dd3328169de9bdc292a
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=libopenssl
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 9b4e12685..260dac68e 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
 PKG_MD5SUM:=60745008b90b7dbe25fe8337c550fec6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openvpn
diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index a16d58420..d57241bfa 100644
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/poptop
 PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pptpd
diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile
index 32b34ae01..91e2092bf 100644
--- a/net/privoxy/Makefile
+++ b/net/privoxy/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=@SF/ijbswa
 PKG_MD5SUM:=252c0e085218fb930c4bc7563e9cedd9
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile
index 91764bb3e..dc7ff1ee4 100644
--- a/net/ptunnel/Makefile
+++ b/net/ptunnel/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/ptunnel/
 PKG_MD5SUM:=b45f73875f2af48f101816672f83a5fe
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ptunnel
diff --git a/net/qolyester/Makefile b/net/qolyester/Makefile
index 9e68c6d7d..86cc568ff 100644
--- a/net/qolyester/Makefile
+++ b/net/qolyester/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=9c1cf1868e085f47e135a86945d93ce0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 PKG_BUILD_DEPENDS:=libnotimpl
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 119c1d8e1..9c84cf27c 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE_URL:=http://www.quagga.net/download/ \
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/quagga/Default
diff --git a/net/raddump/Makefile b/net/raddump/Makefile
index cf6423ca2..7d7a87690 100644
--- a/net/raddump/Makefile
+++ b/net/raddump/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/raddump
 PKG_MD5SUM:=f8c29c67141ea78bb6ae8b97d5149480
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/raddump
diff --git a/net/rarpd/Makefile b/net/rarpd/Makefile
index 941c5d9ed..541642335 100644
--- a/net/rarpd/Makefile
+++ b/net/rarpd/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.dementia.org/pub/net-tools
 PKG_MD5SUM:=04e2ca849e758d0b88c8281775ec3b58
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rarpd
diff --git a/net/reaim/Makefile b/net/reaim/Makefile
index 219a61a0e..f5b32748f 100644
--- a/net/reaim/Makefile
+++ b/net/reaim/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/reaim
 PKG_MD5SUM:=647d2ab72ec454f89294accfb3182c09
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/reaim
diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
index 1748a447c..46a603a22 100644
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/rp-l2tp
 PKG_MD5SUM:=0e45d11cb4fa6c56cce6b1d119733ed9
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rp-l2tpd
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 756723aa8..1e3366c2e 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -16,8 +16,6 @@ PKG_MD5SUM:=54870482fe036b7e69dd48c90661eec6
 PKG_SOURCE_URL:=ftp://se.samba.org/pub/samba/stable \
 	ftp://ftp.easynet.be/samba/stable
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/scanlogd/Makefile b/net/scanlogd/Makefile
index 0543845cc..8de1028c1 100644
--- a/net/scanlogd/Makefile
+++ b/net/scanlogd/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=http://www.openwall.com/scanlogd/ \
 	http://distro.ibiblio.org/pub/linux/distributions/openwall/
 PKG_MD5SUM:=7b8187ea718ebe47f22805b921b909ab
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_INIT_PRIO:=60
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/scdp/Makefile b/net/scdp/Makefile
index f50208020..b2358f878 100644
--- a/net/scdp/Makefile
+++ b/net/scdp/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/scdp
 PKG_MD5SUM:=7eafaf5a422e37d04715613993ed5d95
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/scdp
diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile
index d13649dfa..0dd367340 100644
--- a/net/ser2net/Makefile
+++ b/net/ser2net/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ser2net
 PKG_MD5SUM:=c11f36ff2e4c523be7b282f2f6d03638
 	
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ser2net
diff --git a/net/shat/Makefile b/net/shat/Makefile
index 84f9d87ba..f97c3b7ef 100644
--- a/net/shat/Makefile
+++ b/net/shat/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://world.maxina.de/src/
 PKG_MD5SUM:=da06846f35838b14d1513523dad84d24
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/shat
diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index fdcc9a20f..f1159776f 100644
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 9695 2007-12-09 18:59:01Z nbd $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/siproxd
 PKG_MD5SUM:=6c978eef0d00160e50073e2e2fd8c23d
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/siproxd
diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile
index 2339c57bb..0386b5002 100644
--- a/net/sipsak/Makefile
+++ b/net/sipsak/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://download.berlios.de/sipsak/ \
 	http://ftp.iptel.org/pub/sipsak/
 PKG_MD5SUM:=c4eb8e282902e75f4f040f09ea9d99d5
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/sipsak
diff --git a/net/slurm/Makefile b/net/slurm/Makefile
index 6ba417aaf..25e140961 100644
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.wormulon.net/files/code/slurm/
 PKG_MD5SUM:=e68d09202b835c644f7f6b7f070f29a2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/slurm
diff --git a/net/snort-wireless/Makefile b/net/snort-wireless/Makefile
index b86d2987e..a95be2ae3 100644
--- a/net/snort-wireless/Makefile
+++ b/net/snort-wireless/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.snort-wireless.org/files/
 PKG_MD5SUM:=1aa699ae279bf7a1140cf6cca02f9999
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/snort-wireless/Default
diff --git a/net/snort/Makefile b/net/snort/Makefile
index e87005e17..b66ef0786 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.snort.org/dl/current/
 PKG_MD5SUM:=9dc9060d1f2e248663eceffadfc45e7e
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/snort/Default
diff --git a/net/squid/Makefile b/net/squid/Makefile
index a075e7577..ca4f00f7e 100644
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.6/
 PKG_MD5SUM:=eadb138d48320df8b99349121159c6bf
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/squid/Default
diff --git a/net/sscep/Makefile b/net/sscep/Makefile
index 6b06f31a8..08c7a22ec 100644
--- a/net/sscep/Makefile
+++ b/net/sscep/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://www.klake.org/~jt/sscep/
 PKG_MD5SUM:=b509cdf0de952841471e77499aa6e4ca
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index eed017860..a733bb862 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
 	http://www.br.tcpdump.org/
 PKG_MD5SUM:=c491a78c52fe73f1f7271aa5d8c6ab2e
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tcpdump
diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index d7c5aa009..8dc1fac2a 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages \
 	http://www.mirrors.wiretapped.net/security/network-security/tinc/
 PKG_MD5SUM:=1b59583b5bc57806459c81a413fb0cc4
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tinc
diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile
index 5556af821..3773cea77 100644
--- a/net/tinyproxy/Makefile
+++ b/net/tinyproxy/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/tinyproxy
 PKG_MD5SUM:=bd14d029b12621bcfd7ee71b2f4893da
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tinyproxy
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 62d95a2b8..fbc373c71 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -17,9 +17,6 @@ PKG_MD5SUM:=51caefd77e5d440d0bbd6443db4fc0f8
 PKG_SOURCE_URL:=http://ftp1.sourceforge.net/tsocks/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)beta5.tar.gz
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tsocks
diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile
index 1d65f6b0f..6a0f1ae1a 100644
--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
 	ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/
 PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 define Package/ulogd/Default
   SECTION:=net
   CATEGORY:=Network
diff --git a/net/uob-nomad/Makefile b/net/uob-nomad/Makefile
index 33636e56f..f2f422284 100644
--- a/net/uob-nomad/Makefile
+++ b/net/uob-nomad/Makefile
@@ -15,9 +15,6 @@ PKG_MD5SUM:=9c7445cefaf8d6160017aef606f2e558
 PKG_SOURCE_URL:=http://www.comnets.uni-bremen.de/~mab/openwrt/source/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/uob-nomad
diff --git a/net/vgp/Makefile b/net/vgp/Makefile
index 5e4c94daf..3df25ab8d 100644
--- a/net/vgp/Makefile
+++ b/net/vgp/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://vgpd.freaknet.org/files/
 PKG_MD5SUM:=b8c25b5dfcb944f78bbc584be9c230c7
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vgp
diff --git a/net/wccpd/Makefile b/net/wccpd/Makefile
index 8b9f43857..cfb241a08 100644
--- a/net/wccpd/Makefile
+++ b/net/wccpd/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/wccpd
 PKG_MD5SUM:=5f15c274de61dfb88e0dbfc1ccbe6b67
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wccpd