make ifxmips use a net bridge

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 040ff51..4e194bf 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -7,20 +7,20 @@
 #
 
 RELEASE:=Kamikaze
 #
 
 RELEASE:=Kamikaze

-#VERSION:=2.0 # uncomment for final release
-

 SHELL:=/usr/bin/env bash
 SHELL:=/usr/bin/env bash

-OPENWRTVERSION:=$(RELEASE)

 PREP_MK= OPENWRT_BUILD= QUIET=0
 PREP_MK= OPENWRT_BUILD= QUIET=0

+

 include $(TOPDIR)/include/verbose.mk
 include $(TOPDIR)/include/verbose.mk

-ifneq ($(VERSION),)
-  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
+
+ifeq ($(SDK),1)
+  include $(TOPDIR)/include/version.mk

 else
 else

-  REV:=$(if $(wildcard .svn/entries),$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ))
-  ifneq ($(REV),)
-    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-  endif
+  REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)

 endif
 endif

+
+OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
+export RELEASE
+export REVISION

 export OPENWRTVERSION
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
 export OPENWRTVERSION
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)