package clean up
authorJohn Crispin <john@openwrt.org>
Sun, 21 Oct 2007 15:59:31 +0000 (15:59 +0000)
committerJohn Crispin <john@openwrt.org>
Sun, 21 Oct 2007 15:59:31 +0000 (15:59 +0000)
SVN-Revision: 9396

admin/gkrellmd/Makefile
admin/htop/Makefile
admin/monit/Makefile
admin/osiris/Makefile
admin/syslog-ng/Makefile
admin/zabbix/Makefile

index 37f71c7..01cb3a3 100644 (file)
@@ -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
 
index 394a7b8..1bda989 100644 (file)
@@ -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
index 55c5415..d8618bd 100644 (file)
@@ -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
 
index ea209c9..059b4f4 100644 (file)
@@ -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
index b0af1e2..2357da5 100644 (file)
@@ -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       
index 5774c00..9d54795 100644 (file)
@@ -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