add better working-g++ check (patch from #2017)

[openwrt.git] / package / bridge / Makefile

diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index bd71165..04deb87 100644 (file)
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
@@ -6,34 +12,29 @@ 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
 
-include $(TOPDIR)/package/rules.mk
+PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
 
 define Package/bridge
-SECTION:=base
-CATEGORY:=Network
-DEFAULT:=y
-TITLE:=Ethernet bridging configuration utility
-DESCRIPTION:=Ethernet bridging configuration utility\\\
-Manage ethernet bridging; a way to connect networks together to\\\
-form a larger network.
-URL:=http://bridge.sourceforge.net/
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=Ethernet bridging configuration utility
+  DESCRIPTION:=\
+       Manage ethernet bridging: a way to connect networks together to \\\
+       form a larger network.
+  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/busybox/install
-       mkdir -p $(IDIR_BRIDGE)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/
-       $(STRIP) $(IDIR_BRIDGE)/usr/sbin/brctl
-       $(IPKG_BUILD) $(IDIR_BRIDGE) $(PACKAGE_DIR)
+define Package/bridge/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,bridge))