X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7102aaa3a3dffb3fc767f4d1552395b6cddb5000..1d1240855a20a954a108e5692182e9234a1a7f9a:/package/bridge-utils/Makefile?ds=inline diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index c771ab7cb..0b6eaecb8 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -4,7 +4,6 @@ # 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 @@ -12,16 +11,8 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=bridge-utils 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_VERSION:=1.4 +PKG_MD5SUM:=0182fcac3a2b307113bbec34e5f1c673 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -42,11 +33,13 @@ endef CONFIGURE_ARGS += \ --with-linux-headers="$(LINUX_DIR)" \ -define Build/Configure - (cd $(PKG_BUILD_DIR); \ - [ "$(PKG_VERSION)" = "1.0.6" ] || ln -s configure.in configure.ac; \ - autoconf; \ - ./configure $(CONFIGURE_ARGS) \ +define Build/Prepare +$(call Build/Prepare/Default) + ( cd $(PKG_BUILD_DIR) ; \ + [ -f ./configure ] || { \ + ln -sf configure.in configure.ac ; \ + autoconf ; \ + } \ ) endef