add tpc change from #1949

[openwrt.git] / package / bridge / Makefile

diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index 6c08dc24d0a49d4421994893e956eebb83a9bdea..04deb87a23a61d24fbfa124834781a54843d802e 100644 (file)
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -12,18 +12,17 @@ PKG_NAME:=bridge
 PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
 PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/bridge
 PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
-PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bridge
   SECTION:=net
   CATEGORY:=Base system
-  DEFAULT:=y
   TITLE:=Ethernet bridging configuration utility
   DESCRIPTION:=\
        Manage ethernet bridging: a way to connect networks together to \\\
@@ -31,15 +30,11 @@ define Package/bridge
   URL:=http://bridge.sourceforge.net/
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --with-linux-headers="$(LINUX_DIR)" \
-       )
-endef
+CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
 
 define Package/bridge/install
-       install -m0755 -d $(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,bridge))