Fix merge error

[openwrt.git] / package / bridge-utils / Makefile

diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index c576bb0..35b8838 100644 (file)
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -1,23 +1,29 @@
 # 
 # 

-# 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.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=bridge-utils
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=bridge-utils

-PKG_VERSION:=1.0.6

 PKG_RELEASE:=1
 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:=$(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
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bridge


@@ -35,6 +41,16 @@ endef
 CONFIGURE_ARGS += \
        --with-linux-headers="$(LINUX_DIR)" \
 
 CONFIGURE_ARGS += \
        --with-linux-headers="$(LINUX_DIR)" \
 

+define Build/Prepare
+$(call Build/Prepare/Default)
+       ( cd $(PKG_BUILD_DIR) ; \
+               [ -f ./configure ] || { \
+                       ln -sf configure.in configure.ac ; \
+                       autoconf ; \
+               } \
+       )
+endef
+

 define Package/bridge/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/
 define Package/bridge/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/