summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-12-14 00:33:25 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-12-14 00:33:25 +0000
commit7a694d4e5f8054d5c4b05fbed69fb1a38f387e29 (patch)
tree4c6520daf312b09c3d797d2e2d73ed5aeb3e474b /include
parent9a371dce303c472a82fff666857a48a1022d16ec (diff)
fix the sdk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9747 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/scan.mk2
-rw-r--r--include/toplevel.mk7
2 files changed, 7 insertions, 2 deletions
diff --git a/include/scan.mk b/include/scan.mk
index 28f526aa3..3d97a4f5c 100644
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -49,7 +49,7 @@ $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
-include $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk
-$(TARGET_STAMP):
+$(TARGET_STAMP)::
( \
$(NO_TRACE_MAKE) $(FILELIST); \
MD5SUM=$$(cat $(FILELIST) | (md5sum || md5) | awk '{print $$1}'); \
diff --git a/include/toplevel.mk b/include/toplevel.mk
index 63325aa01..4e194bf50 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -12,7 +12,12 @@ PREP_MK= OPENWRT_BUILD= QUIET=0
include $(TOPDIR)/include/verbose.mk
-REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)
+ifeq ($(SDK),1)
+ include $(TOPDIR)/include/version.mk
+else
+ REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)
+endif
+
OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
export RELEASE
export REVISION