X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fscdp%2FMakefile;h=6ce6387310f0e853d5ea1b1ca1b8ead9b23c3abc;hb=c0b14e29ecf3f24be5f15ce9bc58d932471e08e9;hp=4e3cbff18c156a024c9b8e471e1f65da299b5781;hpb=c131b0e884c1efc214331dccca8bc07e318b78c4;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/scdp/Makefile b/net/scdp/Makefile
index 4e3cbff18c..6ce6387310 100644
--- a/net/scdp/Makefile
+++ b/net/scdp/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -15,10 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/scdp
 PKG_MD5SUM:=7eafaf5a422e37d04715613993ed5d95
-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
 
@@ -27,12 +22,14 @@ define Package/scdp
   CATEGORY:=Network
   DEPENDS:=+libnet0
   TITLE:=An utility to send CDP (Cisco Discovery Protocol) packets
-  DESCRIPTION:=\
-  	This program sends CDP (Cisco Discovery Protocol) packets out on\\\
-	selected interfaces and tells the connected switch (cisco only)\\\
-	where the host is connected.
   URL:=http://sourceforge.net/projects/scdp
 endef
+
+define Package/scdp/description
+	This program sends CDP (Cisco Discovery Protocol) packets out on
+	selected interfaces and tells the connected switch (cisco only)
+	where the host is connected.
+endef
 			
 define Build/Configure
 	$(call Build/Configure/Default, \
@@ -45,13 +42,13 @@ endef
 
 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR=$(PKG_INSTALL_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/scdp/install
-	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/scdp $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scdp $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,scdp))