[brcm63xx] merger mtu/802.1q related fixes:

[openwrt.git] / package / uci / Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index c0b0a42..b88e72c 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -4,12 +4,11 @@
 # 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
 
 UCI_VERSION=0.7
 
 include $(TOPDIR)/rules.mk
 
 UCI_VERSION=0.7

-UCI_RELEASE=1
+UCI_RELEASE=5

 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))


@@ -17,7 +16,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources

-PKG_MD5SUM:=63ca39fcc1fc3819ab6daeabcc241cda
+PKG_MD5SUM:=ed34c5ef606a90da4aba03ce6d22eeb9

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -53,7 +52,7 @@ UCI_MAKEOPTS = \
                COPTS="$(TARGET_CFLAGS)" \
                DEBUG="$(DEBUG)" \
                VERSION="$(UCI_VERSION)" \
                COPTS="$(TARGET_CFLAGS)" \
                DEBUG="$(DEBUG)" \
                VERSION="$(UCI_VERSION)" \

-               CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
+               CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \

                OS="Linux"
 
 # work around a nasty gcc bug
                OS="Linux"
 
 # work around a nasty gcc bug