Makefile cleanups, round 4

SVN-Revision: 12173

diff --git a/utils/alsa-utils/Makefile b/utils/alsa-utils/Makefile
index c086879d7ec6e841474df00fc1b35939bf46d2f8..9dcfde79da81242096eec5f6a70c1b59f4f75c8f 100644 (file)
--- a/utils/alsa-utils/Makefile
+++ b/utils/alsa-utils/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/
 PKG_MD5SUM:=dfe4bb5d3217f3ec662b172ce8397cf0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/alsa-utils

diff --git a/utils/bash/Makefile b/utils/bash/Makefile
index 1d753991aca622cecc1b7a7167733c9eef238068..7fa750b9913bcdee3df2b8b62ffce971e641fd2f 100644 (file)
--- a/utils/bash/Makefile
+++ b/utils/bash/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/bash/
 PKG_MD5SUM:=00bfa16d58e034e3c2aa27f390390d30
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bash

diff --git a/utils/cmdpad/Makefile b/utils/cmdpad/Makefile
index b6ba760de0b4d99206366ed8c4ae37130db1012d..70239c5650673a7eb7f7116f1d5d8fa391ba5c66 100644 (file)
--- a/utils/cmdpad/Makefile
+++ b/utils/cmdpad/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/cmdpad/
 PKG_MD5SUM:=6633b2354b7f23f9cd8e2bfb6e735965
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/cmdpad

diff --git a/utils/digitemp/Makefile b/utils/digitemp/Makefile
index 8b7f9071428504f5fedf7618f37ddc0c2d070040..ccb297728a3326a7e3e4d3e2eac141033cd25544 100644 (file)
--- a/utils/digitemp/Makefile
+++ b/utils/digitemp/Makefile
@@ -9,9 +9,6 @@ PKG_SOURCE_URL:=http://www.digitemp.com/software/linux
 PKG_MD5SUM:=72bda9c8a66b017aa969c19dedb3225b
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/digitemp

diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile
index c674aca23c15ee8e7591daa932a72cadbae2ea2b..ef61297eba13851a3f1a868e62b0c3cd322ae8fc 100644 (file)
--- a/utils/dosfstools/Makefile
+++ b/utils/dosfstools/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz
 PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/
 PKG_MD5SUM:=407d405ade410f7597d364ab5dc8c9f6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dosfstools

diff --git a/utils/firmwarehotplug/Makefile b/utils/firmwarehotplug/Makefile
index 372839206d8ae38935cfd6a1a2e717a82a6dbb41..6b41246bbe3851624e1caecacb0eda62a56661d9 100644 (file)
--- a/utils/firmwarehotplug/Makefile
+++ b/utils/firmwarehotplug/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-hotplug
 PKG_MD5SUM:=e5cf352b172f498e27b160167b981f24
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 # workaround for fedora sdcc naming changes

diff --git a/utils/gadgetfs-test/Makefile b/utils/gadgetfs-test/Makefile
index df7610ea90c162d2cc7ac565ea138fa7ebdd3c68..814b123f52bd477dada51679ef6ea420ed27503a 100644 (file)
--- a/utils/gadgetfs-test/Makefile
+++ b/utils/gadgetfs-test/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://avr32linux.org/twiki/pub/Main/GadgetFsTest
 PKG_MD5SUM:=49476a74c29f1281c8a4c035aa57a5bd
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/utils/gnokii/Makefile b/utils/gnokii/Makefile
index 0bca863e41446303ed9c9c2016396bd9e430a888..11c131cf219b20ed8fea9b24315d6bfd611cd909 100644 (file)
--- a/utils/gnokii/Makefile
+++ b/utils/gnokii/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://gnokii.org/download/gnokii/0.6.x
 PKG_MD5SUM:=bbf0aabe2436d8e927f3e2edb4efcac8
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gnokii

diff --git a/utils/lirc/Makefile b/utils/lirc/Makefile
index 8fd36897d9f2b1504c1476792f585461690464f7..94794cc32995775cee7f314f4e4bf4519221f09e 100644 (file)
--- a/utils/lirc/Makefile
+++ b/utils/lirc/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/${PKG_NAME}
 PKG_MD5SUM:=8e78eeded7b31e5ad02e328970437c0f
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define  Package/lirc/Default

diff --git a/utils/logrotate/Makefile b/utils/logrotate/Makefile
index 00366902a74a59d847d87905aa66d9f0639bb0cb..8567499cde67715de51730459d609038e1c30c37 100644 (file)
--- a/utils/logrotate/Makefile
+++ b/utils/logrotate/Makefile
@@ -20,9 +20,6 @@ PKG_SOURCE_URL:= \
        http://ftp.us.debian.org/debian/pool/main/l/logrotate
 PKG_MD5SUM:=552639142e163745f6bcd4f1f3816d8a
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/logrotate

diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile
index 9c8675f13a19034a3a84f2c9036e36567dfaca8e..ad78af60d17c16b45b0755c6f52be40f5dd3d888 100644 (file)
--- a/utils/lrzsz/Makefile
+++ b/utils/lrzsz/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ohse.de/uwe/releases/
 PKG_MD5SUM:=b5ce6a74abc9b9eb2af94dffdfd372a4
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lrzsz

diff --git a/utils/macchanger/Makefile b/utils/macchanger/Makefile
index 92edc1bee6535fecca7a826f3f5fe5745a5119f1..580ff6134b6fd46dba520654025d4b516d7c763c 100644 (file)
--- a/utils/macchanger/Makefile
+++ b/utils/macchanger/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/macchanger
 PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/macchanger

diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile
index bf01704f442568a98c5c6479f78b9a9e2995edcf..e21341839cc3177986d490ea73993ff693f7942c 100644 (file)
--- a/utils/rrdcollect/Makefile
+++ b/utils/rrdcollect/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/rrdcollect
 PKG_MD5SUM:=5e4305c612bc3cccbaf802c275c81a11
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rrdcollect/Default

diff --git a/utils/screen/Makefile b/utils/screen/Makefile
index 2278d5daf1929bffa8a24fada15a1aec03a8ed58..155a0a225247410f845c2b0840a1495d42e04028 100644 (file)
--- a/utils/screen/Makefile
+++ b/utils/screen/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/utilities/screen \
        @GNU/screen
 PKG_MD5SUM:=8506fd205028a96c741e4037de6e3c42
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/screen

diff --git a/utils/unzip/Makefile b/utils/unzip/Makefile
index ed338dcc054989d619f01c404389feeafbb901df..93a74e90b1ad60fe07fb675f48e483e383ee7c98 100644 (file)
--- a/utils/unzip/Makefile
+++ b/utils/unzip/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)552.zip
 PKG_SOURCE_URL:=@SF/infozip
 PKG_MD5SUM:=3d55b4e7375c3d0b81feca52dc0e4d48
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile
index 098f32bd60add48477a70ed49eebb2bc8de70041..e9ab55df3ec7d17c8cf94765f71611ca72dc2f0a 100644 (file)
--- a/utils/usbutils/Makefile
+++ b/utils/usbutils/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-usb
 PKG_MD5SUM:=88978b4ad891f610620b1b8e5e0f43eb
 
-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/utils/valgrind/Makefile b/utils/valgrind/Makefile
index b52983ce1d4469e7d2cd5e6bdf1c557669eae16d..ccf48f2c67b5101853dc01efce71e89d95f1c01a 100644 (file)
--- a/utils/valgrind/Makefile
+++ b/utils/valgrind/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://valgrind.org/downloads/
 PKG_MD5SUM:=978847992b136c8d8cb5c6559a91df1c
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/valgrind

diff --git a/utils/wx200d/Makefile b/utils/wx200d/Makefile
index 7ab6592a8bfb2d02d0f7919c46592d0b87b1d8d1..f4a229a1b6fca7664b5cb9561d8cb1a8009c368c 100644 (file)
--- a/utils/wx200d/Makefile
+++ b/utils/wx200d/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/wx200d
 PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wx200d

diff --git a/utils/zip/Makefile b/utils/zip/Makefile
index 8b4521e0c94fbb8bb759f831e1fb01be00929529..fe3fb0cbb5fae23d6344bc4dedf28baebf4c50a5 100644 (file)
--- a/utils/zip/Makefile
+++ b/utils/zip/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)232.zip
 PKG_SOURCE_URL:=@SF/infozip
 PKG_MD5SUM:=da947ed356e5fdb30ff4bc3dc7698f33
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 
 include $(INCLUDE_DIR)/package.mk