X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbridge-utils%2FMakefile;h=6dea48435655515fed99ca4b658cf625d1d6fa5b;hp=c576bb011a474291f32e80f713626d21e0a54f3c;hb=52518b3c31222c4f3d645e435027c6bd01fdda58;hpb=db94d68739a8afa67ae703f682f3dcc58ab96b61

diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index c576bb011a..6dea484356 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,14 +10,21 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=bridge-utils
-PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
+PKG_SOURCE_URL:=@SF/bridge
+
+ifeq ($(CONFIG_LINUX_2_4),y)
+  PKG_VERSION:=1.0.6
+  PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
+endif
+
+ifeq ($(CONFIG_LINUX_2_6),y)
+  PKG_VERSION:=1.4
+  PKG_MD5SUM:=0182fcac3a2b307113bbec34e5f1c673
+endif
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/bridge
-PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
 
-include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bridge
@@ -35,6 +42,13 @@ endef
 CONFIGURE_ARGS += \
 	--with-linux-headers="$(LINUX_DIR)" \
 
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); \
+	autoconf; \
+	./configure $(CONFIGURE_ARGS) \
+	)
+endef
+
 define Package/bridge/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/