Commit from LuCI Translation Portal by user jow.: 105 of 105 messages translated...

[project/luci.git] / contrib / uci / Makefile

diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile
index bac8ee8ac15bad5520e0fcd9d614620ae7a92970..b0ea8c0b6094e48b323c57b4dcab3b0c283a7dbb 100644 (file)
--- a/contrib/uci/Makefile
+++ b/contrib/uci/Makefile
@@ -1,13 +1,12 @@
 include ../../build/config.mk
 include ../../build/gccconfig.mk
 
-UCI_VERSION  = 0.6.0
-UCI_APPEND   = +luci2
+UCI_VERSION  = 0.8.0
 #UCI_SITE    = http://mirror2.openwrt.org/sources
 #UCI_DIR     = uci-$(UCI_VERSION)
 #UCI_FILE    = $(UCI_DIR).tar.gz
 #UCI_URL     = $(UCI_SITE)/$(UCI_FILE)
-UCI_GITREV   = a5256582f5a554c0cbcf45d19bb751e60ea42ce9
+UCI_GITREV   = aa3ab8012bfbf793d2884c08ea924545a04e9544
 UCI_SITE     = http://nbd.name
 UCI_DIR      = uci.git
 UCI_FILE     = uci-$(UCI_VERSION)$(UCI_APPEND).tar.gz
@@ -21,39 +20,21 @@ include ../../build/module.mk
 $(UCI_FILE):
        wget -O $@ "$(UCI_URL)" || rm -f $@
 
-$(UCI_PATCHDIR)/series:
-       (cd $(UCI_PATCHDIR); ls *.patch | sort > series)
-
 $(UCI_DIR)/.prepared: $(UCI_FILE)
        rm -rf $(UCI_DIR)
        tar xvfz $(UCI_FILE)
-       ln -s ../$(UCI_PATCHDIR) $(UCI_DIR)/patches
-       touch $@
-
-$(UCI_DIR)/.patched: $(UCI_DIR)/.prepared $(UCI_PATCHDIR)/series
-       (cd $(UCI_DIR); \
-               if [ -x "$$(which quilt 2>/dev/null)" ]; then \
-                       quilt push -a; \
-               else \
-                       cat patches/*.patch | patch -p1; \
-               fi; \
-       )
+       (cd $(UCI_PATCHDIR); ls *.patch | sort > series) || true
+       [ -f "$(UCI_PATCHDIR)/series" ] && while read patch; do \
+               patch -d $(UCI_DIR) -p1 < $(UCI_PATCHDIR)/$$patch; \
+       done < $(UCI_PATCHDIR)/series || true
        touch $@
 
-refresh: $(UCI_DIR)/.patched
-       (cd $(UCI_DIR); \
-               for i in $$(quilt series); do \
-                       quilt refresh $$i; \
-               done; \
-       )
-
-compile: $(UCI_DIR)/.patched
+compile: $(UCI_DIR)/.prepared
        $(MAKE) -C $(UCI_DIR) CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
        mkdir -p dist/usr/lib dist/usr/bin
        $(MAKE) -C $(UCI_DIR) install DESTDIR=../dist prefix=/usr
        $(MAKE) -C $(UCI_DIR)/lua CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
        $(MAKE) -C $(UCI_DIR)/lua install DESTDIR=../../dist luadir=$(LUA_LIBRARYDIR)
-       mv dist$(LUA_LIBRARYDIR)/uci.so dist$(LUA_LIBRARYDIR)/uci2.so
 
 compile-all: compile