Makefile cleanups, round 6 and last

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12175 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-05 22:04:10 +00:00 · 2008-08-05 22:04:10 +00:00 · 23487d9434
commit 23487d9434
parent 74dc198393
71 changed files with 1 additions and 183 deletions
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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

--- 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
--- 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
--- 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
--- 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 += \
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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