From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 5 Aug 2008 22:03:15 +0000 (+0000)
Subject: Makefile cleanups, round 5
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=b74e5d849eabf4d604db51c38b4ad0a1f03bd40e

Makefile cleanups, round 5

SVN-Revision: 12174
---

diff --git a/libs/argtable/Makefile b/libs/argtable/Makefile
index ff403c62b5..90e267650f 100644
--- a/libs/argtable/Makefile
+++ b/libs/argtable/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE_URL:=@SF/argtable
 PKG_MD5SUM:=a84130293aab3bc09631cbee717ede93
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2-7
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/clinkc/Makefile b/libs/clinkc/Makefile
index 665b35148e..868f58a4ad 100644
--- a/libs/clinkc/Makefile
+++ b/libs/clinkc/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=@SF/clinkc/
 PKG_MD5SUM:=4c8ac54a15da47203a86daf77fbc2664
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/CyberLinkC
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DEPENDS:=libexpat
 
diff --git a/libs/confuse/Makefile b/libs/confuse/Makefile
index b61a8df1f4..3b180400d8 100644
--- a/libs/confuse/Makefile
+++ b/libs/confuse/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/confuse/
 PKG_MD5SUM:=4bc9b73d77ebd571ac834619ce0b3582
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/confuse
diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile
index 8b39cdbddf..5eb0dc4020 100644
--- a/libs/cyrus-sasl/Makefile
+++ b/libs/cyrus-sasl/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.andrew.cmu.edu/pub/cyrus-mail/
 PKG_MD5SUM:=268ead27f4ac39bcfe17d9e38e0f2977
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=libopenssl
 PKG_FIXUP = libtool
 
diff --git a/libs/db/Makefile b/libs/db/Makefile
index 9542af7462..faafcceada 100644
--- a/libs/db/Makefile
+++ b/libs/db/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=ftp://ftp.sleepycat.com/releases/ \
 	http://downloads.sleepycat.com/
 PKG_MD5SUM:=8b5cff6eb83972afdd8e0b821703c33c
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdb
diff --git a/libs/gd/Makefile b/libs/gd/Makefile
index cc8e859311..399f7c6e0c 100644
--- a/libs/gd/Makefile
+++ b/libs/gd/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.boutell.com/gd/http
 PKG_MD5SUM:=be0a6d326cd8567e736fbc75df0a5c45
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libgd
diff --git a/libs/gsm/Makefile b/libs/gsm/Makefile
index f3bf23e371..e5c1ed3472 100644
--- a/libs/gsm/Makefile
+++ b/libs/gsm/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
 PKG_MD5SUM:=4b148480f82e96d274248e13880ec873
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libgsm
diff --git a/libs/howl/Makefile b/libs/howl/Makefile
index 4b69fc030b..79d647319f 100644
--- a/libs/howl/Makefile
+++ b/libs/howl/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.porchdogsoft.com/download/
 PKG_MD5SUM:=c389d3ffba0e69a179de2ec650f1fdcc
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/howl/Default
diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index a0b1d8f65f..d1321eeee6 100644
--- a/libs/jpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://www.ijg.org/files/ \
         ftp://ftp.uu.net/graphics/jpeg/
 PKG_MD5SUM:=dbd5f3b47ed13132f04c685d608a7547
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/libamsel/Makefile b/libs/libamsel/Makefile
index d205f88730..37da29e70c 100644
--- a/libs/libamsel/Makefile
+++ b/libs/libamsel/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/
 PKG_MD5SUM:=2077e620047404881a65d39c53c9917e
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libamsel
diff --git a/libs/libao/Makefile b/libs/libao/Makefile
index c5ac5b3c1c..76c9575087 100644
--- a/libs/libao/Makefile
+++ b/libs/libao/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ao/
 PKG_MD5SUM:=12e136a4c0995068ff134997c84421ed
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libao
diff --git a/libs/libart/Makefile b/libs/libart/Makefile
index 7716b0f6e7..eb8fed8b4e 100644
--- a/libs/libart/Makefile
+++ b/libs/libart/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3
 PKG_MD5SUM:=a2992b830295132dae2bf85d1156e48e
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_lgpl-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/libatomicops/Makefile b/libs/libatomicops/Makefile
index 176c7e6ddb..3d3721a759 100644
--- a/libs/libatomicops/Makefile
+++ b/libs/libatomicops/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://www.hpl.hp.com/research/linux/atomic_ops/download/
 PKG_MD5SUM:=1b65e48271c81e3fa2d7a9a69bab7504
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libatomic_ops-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile
index ca3aaf2fc6..31df245066 100644
--- a/libs/libaudiofile/Makefile
+++ b/libs/libaudiofile/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast
 PKG_MD5SUM:=460f848ce5f4a33ae66b15a4fb7720ec
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libaudiofile
diff --git a/libs/libbfd/Makefile b/libs/libbfd/Makefile
index 32708cd9ba..bd115a8e39 100644
--- a/libs/libbfd/Makefile
+++ b/libs/libbfd/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/binutils
 PKG_MD5SUM:=6a9d529efb285071dad10e1f3d2b2967
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 TARGETS:=$(GNU_TARGET_NAME)
diff --git a/libs/libcli/Makefile b/libs/libcli/Makefile
index 285e7520c9..8aa81b85c3 100644
--- a/libs/libcli/Makefile
+++ b/libs/libcli/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libcli
 PKG_MD5SUM:=0fdd30df5a8c1388a4549751ba61247a
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libcli
diff --git a/libs/libdaemon/Makefile b/libs/libdaemon/Makefile
index 81b079745a..694827ac15 100644
--- a/libs/libdaemon/Makefile
+++ b/libs/libdaemon/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/
 PKG_MD5SUM:=76596823cc1a6d1cdf7779b782ff0ee6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdaemon
diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile
index ae4c843c96..5bd4a72b15 100644
--- a/libs/libdnet/Makefile
+++ b/libs/libdnet/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=416b765e9d9961501ac85e9a366fd219
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/libdnet-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdnet
diff --git a/libs/libdvbpsi4/Makefile b/libs/libdvbpsi4/Makefile
index 025abfdeb9..af09790f22 100644
--- a/libs/libdvbpsi4/Makefile
+++ b/libs/libdvbpsi4/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.videolan.org/pub/libdvbpsi/$(PKG_VERSION)/
 PKG_MD5SUM:=407cd074b7d6eaf31b20b693ed924655
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdvbpsi4
diff --git a/libs/libevent/Makefile b/libs/libevent/Makefile
index 80c5fd9ca1..7d8b66208c 100644
--- a/libs/libevent/Makefile
+++ b/libs/libevent/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.monkey.org/~provos/
 PKG_MD5SUM:=a5bd281aeb41bdaa48fbbf0495423d20
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libevent
diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile
index a4ff381b5d..945c4bc22e 100644
--- a/libs/libexif/Makefile
+++ b/libs/libexif/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/libexif
 PKG_MD5SUM:=1b1e2b495c5aa20c08725f30545a110b
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libexif
diff --git a/libs/libffi-sable/Makefile b/libs/libffi-sable/Makefile
index 638376d752..cfb139650f 100644
--- a/libs/libffi-sable/Makefile
+++ b/libs/libffi-sable/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://sablevm.org/download/snapshot/2005-01-21/
 PKG_MD5SUM:=0c32eaaea0269c5fbe156fcd0be3e5bd
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libffi-sable
diff --git a/libs/libid3tag/Makefile b/libs/libid3tag/Makefile
index 597cca4389..d21ef5f1c1 100644
--- a/libs/libid3tag/Makefile
+++ b/libs/libid3tag/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad
 PKG_MD5SUM:=e5808ad997ba32c498803822078748c3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libid3tag
diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile
index ad4fbfce0b..30360b9d37 100644
--- a/libs/libmad/Makefile
+++ b/libs/libmad/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=@SF/mad \
 	ftp://ftp.mars.org/pub/mpeg/
 PKG_MD5SUM:=1be543bc30c56fb6bea1d7bf6a64e66c
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 FPM:=default
diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile
index 46e16c45aa..f71b220f3a 100644
--- a/libs/libmcrypt/Makefile
+++ b/libs/libmcrypt/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mcrypt
 PKG_MD5SUM:=b1be163143f8e8ed0474beeb642b3bad
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libmcrypt
diff --git a/libs/libmpcdec/Makefile b/libs/libmpcdec/Makefile
index cedb5ec787..4c04bb1479 100644
--- a/libs/libmpcdec/Makefile
+++ b/libs/libmpcdec/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://files.musepack.net/source/
 PKG_MD5SUM:=9ce052b671df5a76e0e7f2b2eb037798
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libmpcdec
diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile
index 34c57ea8ba..c58aa9a351 100644
--- a/libs/libnet-1.0.x/Makefile
+++ b/libs/libnet-1.0.x/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/
 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Libnet-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile
index b60939ab72..198d09bccf 100644
--- a/libs/libnet-1.1.x/Makefile
+++ b/libs/libnet-1.1.x/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/
 PKG_MD5SUM:=be845c41170d72c7db524f3411b50256
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libnet
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/libnids/Makefile b/libs/libnids/Makefile
index 450afb18a5..ace4ca061e 100644
--- a/libs/libnids/Makefile
+++ b/libs/libnids/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.packetfactory.net/projects/libnids/dist/
 PKG_MD5SUM:=9ee6dcdfac97bae6fe611aa27d2594a5
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libnids
diff --git a/libs/libol/Makefile b/libs/libol/Makefile
index 3dd0156f2f..01981c2aae 100644
--- a/libs/libol/Makefile
+++ b/libs/libol/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.balabit.com/downloads/libol/0.3
 PKG_MD5SUM:=cbadf4b7ea276dfa85acc38a1cc5ff17
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libol
diff --git a/libs/libpam/Makefile b/libs/libpam/Makefile
index 05a3906eb5..eb5c777226 100644
--- a/libs/libpam/Makefile
+++ b/libs/libpam/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/libs/pam/pre/library/
 PKG_MD5SUM:=0f17f7105faa82a51dfbeb6b08a1ca29
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Linux-PAM-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/librsync/Makefile b/libs/librsync/Makefile
index c55879718f..5fe3c7211f 100644
--- a/libs/librsync/Makefile
+++ b/libs/librsync/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/librsync
 PKG_MD5SUM:=24cdb6b78f45e0e83766903fd4f6bc84
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/librsync
diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile
index 35709444df..d87154bc36 100644
--- a/libs/libusb/Makefile
+++ b/libs/libusb/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libusb
 PKG_MD5SUM:=caf182cbc7565dac0fd72155919672e6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libusb
diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile
index ef257df34a..1ed04cf7be 100644
--- a/libs/libvorbisidec/Makefile
+++ b/libs/libvorbisidec/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/
 PKG_MD5SUM:=bc617d4af1cd74b38d7c51451dd6eff0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index 6b7297f8a7..eba36006de 100644
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -20,9 +20,6 @@ PKG_SOURCE_URL:=\
 	http://mysql.holywar.net/Downloads/MySQL-5.0/
 PKG_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile
index a19ffda952..d01e987ca1 100644
--- a/libs/openldap/Makefile
+++ b/libs/openldap/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
 	ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
 PKG_MD5SUM:=6c4c72a1336aa45b463e738034c078d6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/popt/Makefile b/libs/popt/Makefile
index b383934f0b..7c2e77b121 100644
--- a/libs/popt/Makefile
+++ b/libs/popt/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
 PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libpopt
diff --git a/libs/rrdtool-1.0.x/Makefile b/libs/rrdtool-1.0.x/Makefile
index cb982fe46c..bc79f15450 100644
--- a/libs/rrdtool-1.0.x/Makefile
+++ b/libs/rrdtool-1.0.x/Makefile
@@ -20,8 +20,6 @@ PKG_SOURCE_URL:= \
 	ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/rrdtool-1.0.x
 PKG_MD5SUM:=c466e2e7df95fa8e318e46437da87686
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/librrd1
diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile
index 877c3a3c7e..076f3473bf 100644
--- a/libs/sqlite2/Makefile
+++ b/libs/sqlite2/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_MD5SUM:=838dbac20b56d2c4292e98848505a05b
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DEPENDS:=libncurses libreadline
 
diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile
index 71157a2e26..5d00a10b66 100644
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_MD5SUM:=2feec9b429f9298c9f288420c8b449f8
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/ustl/Makefile b/libs/ustl/Makefile
index be01e00048..07731f1292 100644
--- a/libs/ustl/Makefile
+++ b/libs/ustl/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-0.8-0.tar.bz2
 PKG_SOURCE_URL:=@SF/ustl
 PKG_MD5SUM:=dd59483c327f1bd1356273bc5ae4dde0
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ustl
diff --git a/libs/zaptel/Makefile b/libs/zaptel/Makefile
index 383c3d6e6a..43a7ce3683 100644
--- a/libs/zaptel/Makefile
+++ b/libs/zaptel/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.digium.com/pub/zaptel/releases/ ftp://ftp.digium.com/pub/zaptel/releases/
 PKG_MD5SUM:=99b9f86556b903a32607b2751f920513
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/zaptel/Default