fix package name in template call, remove unneeded patch,

don't use PKG_INSTALL_DIR since upstream does not provide a make install target, 
add configurable init script, 
add Id tag and target optimization cflags..


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2674 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 12 insertions, 10 deletions

diff --git a/openwrt/package/vrrpd/Makefile b/openwrt/package/vrrpd/Makefile
index 82ee36b7b3..b4aa4e0d5b 100755..100644
--- a/openwrt/package/vrrpd/Makefile
+++ b/openwrt/package/vrrpd/Makefile
@@ -1,33 +1,35 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vrrpd
 PKG_VERSION:=1.0
 PKG_RELEASE:=1
-
 PKG_MD5SUM:=6d5066ea1a6ced817376ca0f54765447
-PKG_SOURCE_URL:=@SF/vrrpd
 
+PKG_SOURCE_URL:=@SF/vrrpd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,VRRPD,VRRPD,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,VRRPD,vrrpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	mkdir -p $(PKG_INSTALL_DIR)/usr/sbin
-	$(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR)
-	install -m0755 $(PKG_BUILD_DIR)/vrrpd $(PKG_INSTALL_DIR)/usr/sbin/
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) \
+		DBG_OPT="" \
+		MAIN_OPT="$(TARGET_CFLAGS)" \
+		vrrpd
 	touch $@
 
 $(IPKG_VRRPD):
-	mkdir -p $(IDIR_VRRPD)
-	cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VRRPD)/
+	install -d -m0755 $(IDIR_VRRPD)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/vrrpd $(IDIR_VRRPD)/usr/sbin/
 	$(RSTRIP) $(IDIR_VRRPD)
 	$(IPKG_BUILD) $(IDIR_VRRPD) $(PACKAGE_DIR)