[Packages] admin/gkrellmd: Update to 2.3.1 (http://lists.openwrt.org/pipermail/openwr...

[openwrt/svn-archive/archive.git] / net / quagga / Makefile

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index c23f59ce9c9dab560e54271216b0f33621edab71..156de977c50e0c5ee78d570b6ad95d49750dd6e9 100644 (file)
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.uk.quagga.net/download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -29,13 +28,17 @@ define Package/quagga
   SECTION:=net
   CATEGORY:=Network
   TITLE:=The Quagga Software Routing Suite
-  DESCRIPTION:=A routing software package that provides TCP/IP based routing services\\\
-       with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,\\\
-       OSPFv3, BGP-4, and BGP-4+\\\
   URL:=http://www.quagga.net
   MENU:=1
 endef
 
+define Package/quagga/description
+A routing software package that provides TCP/IP based routing services
+       with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
+       OSPFv3, BGP-4, and BGP-4+
+
+endef
+
 define Package/quagga-libzebra
   SECTION:=net
   CATEGORY:=Network
@@ -101,6 +104,7 @@ endef
 
 define Build/Configure
        $(call Build/Configure/Default, \
+               --localstatedir=/var/run/quagga \
                --sysconfdir=/etc/quagga/ \
                --enable-shared \
                --disable-static \
@@ -121,8 +125,8 @@ endef
 
 define Package/quagga/install  
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/
        # avoid /etc being set to 0750
        $(INSTALL_DIR) $(1)/etc/quagga/
        chmod 0750 $(1)/etc/quagga/
@@ -182,39 +186,37 @@ endef
 
 define Package/quagga-bgpd/install     
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/
 endef
 
 define Package/quagga-isisd/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin
 endef
 
 define Package/quagga-ospfd/install    
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/
 endef
 
 define Package/quagga-ospf6d/install   
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
 endef
 
 define Package/quagga-ripd/install     
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/
 endef
 
 define Package/quagga-ripngd/install   
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/
 endef
 
 define Package/quagga-vtysh/install    
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/
 endef
 
 define Package/quagga-libospf/install