From: John Crispin <john@openwrt.org>
Date: Sun, 21 Oct 2007 15:59:31 +0000 (+0000)
Subject: package clean up
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=46395bfe3ec40bcea5dfafa2a876e5667f2f3b03

package clean up

SVN-Revision: 9396
---

diff --git a/admin/gkrellmd/Makefile b/admin/gkrellmd/Makefile
index 37f71c73b1..01cb3a3bcd 100644
--- a/admin/gkrellmd/Makefile
+++ b/admin/gkrellmd/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE:=gkrellm-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=57ef0525c0997ac2e7720712811f5a84
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/gkrellm-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/admin/htop/Makefile b/admin/htop/Makefile
index 394a7b84c0..1bda9897ae 100644
--- a/admin/htop/Makefile
+++ b/admin/htop/Makefile
@@ -27,7 +27,7 @@ define Package/htop
 endef
 
 define Package/htop/description
- An interactive process viewer with colors tree mode and other features.
+	An interactive process viewer with colors tree mode and other features.
 endef
 
 define Build/Compile
diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index 55c5415204..d8618bdb0d 100644
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -27,7 +27,7 @@ define Package/monit/Default
 endef
 
 define Package/monit/Default/description
- An utility for monitoring services on a Unix system
+	An utility for monitoring services on a Unix system
 endef
 
 define Package/monit
@@ -38,7 +38,7 @@ endef
 
 define Package/monit/description
 $(call Package/monit/Default/description)
- This package is built with SSL support.
+	This package is built with SSL support.
 endef
 
 define Package/monit-nossl
@@ -48,10 +48,9 @@ endef
 
 define Package/monit-nossl/description
 $(call Package/monit/Default/description)
- This package is built without SSL support.
+	This package is built without SSL support.
 endef
 
-
 define Build/Template
 
 $(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
@@ -78,7 +77,6 @@ endef
 
 endef
 
-
 define Build/Configure
 endef
 
diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile
index ea209c9be3..059b4f4b42 100644
--- a/admin/osiris/Makefile
+++ b/admin/osiris/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://osiris.shmoo.com/data/
 PKG_MD5SUM:=1951c7dc0fe729af9ffaf58910340d12
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/osirisd
diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index b0af1e27a4..2357da5865 100644
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:= http://www.balabit.com/downloads/syslog-ng/1.6/src \
 		http://www.balabit.com/downloads/syslog-ng/stable/src
 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/syslog-ng
@@ -31,10 +28,9 @@ define Package/syslog-ng
 endef
 
 define Package/syslog-ng/description
-syslog-ng reads and logs messages to the system console, log
+	syslog-ng reads and logs messages to the system console, log
 	files, other machines and/or users as specified by its
 	configuration file.
-
 endef
 
 define Package/syslog-ng/conffiles
@@ -50,8 +46,7 @@ $(call Build/Configure/Default,--disable-dependency-tracking \
 endef
 
 define Build/Compile	
-$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install)
+$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
 endef
 
 define Package/syslog-ng/install	
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 5774c00199..9d54795b75 100644
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -16,9 +16,6 @@ PKG_MD5SUM:=698a07f4e53820e44ef4a72c7c191e92
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/zabbix
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=libsqlite3
 
 include $(INCLUDE_DIR)/package.mk