|
diff --git a/Vars.make b/Vars.make index a58801e..ea8fb51 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -35,33 +35,33 @@ ifdef CONFIG_TARGET_YOPY |
35 | PLATFORM=yopy-linux |
35 | PLATFORM=yopy-linux |
36 | endif |
36 | endif |
37 | ifdef CONFIG_TARGET_MACOSX |
37 | ifdef CONFIG_TARGET_MACOSX |
38 | PLATFORM=macx-darwin |
38 | PLATFORM=macx-darwin |
39 | endif |
39 | endif |
40 | |
40 | |
41 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
41 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
42 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
42 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
43 | |
43 | |
44 | ifeq ($(QPE_VERSION),) |
44 | ifeq ($(QPE_VERSION),) |
45 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
45 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
46 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
46 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
47 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
47 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
48 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
48 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
49 | |
49 | |
50 | ifeq ($(QPE_VERSION),..) |
50 | ifeq ($(QPE_VERSION),..) |
51 | QPE_VERSION=1.1.0 |
51 | QPE_VERSION=1.1.2 |
52 | endif |
52 | endif |
53 | endif |
53 | endif |
54 | export QPE_VERSION |
54 | export QPE_VERSION |
55 | |
55 | |
56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
57 | ifeq ($(VERSION_CVS),) |
57 | ifeq ($(VERSION_CVS),) |
58 | VERSION_CVS:=$(shell date +%Y%m%d) |
58 | VERSION_CVS:=$(shell date +%Y%m%d) |
59 | endif |
59 | endif |
60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
61 | SUB_VERSION:=$(VERSION_CVS) |
61 | SUB_VERSION:=$(VERSION_CVS) |
62 | endif |
62 | endif |
63 | export SUB_VERSION |
63 | export SUB_VERSION |
64 | |
64 | |
65 | ifneq ($(strip $(SUB_VERSION)),) |
65 | ifneq ($(strip $(SUB_VERSION)),) |
66 | EXTRAVERSION=-$(SUB_VERSION) |
66 | EXTRAVERSION=-$(SUB_VERSION) |
67 | endif |
67 | endif |
|