fixes for common config functions

[openwrt.git] / package / iproute2 / Makefile

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 0fe03bc..bbbcc75 100644 (file)
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -12,27 +12,17 @@ PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
 PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
 PKG_CAT:=zcat
 
 PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
 PKG_CAT:=zcat
 

-include $(TOPDIR)/package/rules.mk
-
-# define Package/iproute2
-# SECTION:=base
-# CATEGORY:=Network
-# DEFAULT:=n
-# MENU:=1
-# TITLE:=A collection of utilites for controlling TCP/IP networking and Traffic Control
-# endef
+include $(INCLUDE_DIR)/package.mk

 
 define Package/ip
 SECTION:=base
 CATEGORY:=Network
 
 define Package/ip
 SECTION:=base
 CATEGORY:=Network

-DEFAULT:=n

 DEPENDS:=iproute2
 TITLE:=A routing control utility
 endef
 
 define Package/tc
 $(call Package/ip)
 DEPENDS:=iproute2
 TITLE:=A routing control utility
 endef
 
 define Package/tc
 $(call Package/ip)

-# DEPENDS:=kmod-sched

 TITLE:=A traffic control utility
 endef
 
 TITLE:=A traffic control utility
 endef
 


@@ -54,15 +44,14 @@ define Build/Compile
 endef
 
 define Package/ip/install
 endef
 
 define Package/ip/install

-       install -d -m0755 $(IDIR_IP)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/
+       install -d -m0755 $(1)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/

 endef
 
 define Package/tc/install
 endef
 
 define Package/tc/install

-       install -d -m0755 $(IDIR_TC)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/
+       install -d -m0755 $(1)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/

 endef
 
 endef
 

-# $(eval $(call BuildPackage,iproute2))
-# $(eval $(call BuildPackage,ip))
-# $(eval $(call BuildPackage,tc))
+$(eval $(call BuildPackage,ip))
+$(eval $(call BuildPackage,tc))