Unidiff1 files changed, 4 insertions, 0 deletions
|
diff --git a/Vars.make b/Vars.make index cc463d3..59766d1 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -46,24 +46,28 @@ ifeq ($(QPE_VERSION),) |
46 | endif |
46 | endif |
47 | export QPE_VERSION |
47 | export QPE_VERSION |
48 | |
48 | |
49 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
49 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
50 | ifeq ($(VERSION_CVS),) |
50 | ifeq ($(VERSION_CVS),) |
51 | VERSION_CVS:=$(shell date +%Y%m%d) |
51 | VERSION_CVS:=$(shell date +%Y%m%d) |
52 | endif |
52 | endif |
53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
54 | SUB_VERSION:=$(VERSION_CVS) |
54 | SUB_VERSION:=$(VERSION_CVS) |
55 | endif |
55 | endif |
56 | export SUB_VERSION |
56 | export SUB_VERSION |
57 | |
57 | |
| |
58 | ifneq ($(strip $(SUB_VERSION)),) |
| |
59 | EXTRAVERSION=-$(SUB_VERSION) |
| |
60 | endif |
| |
61 | |
58 | ifeq ($(QTE_REVISION),) |
62 | ifeq ($(QTE_REVISION),) |
59 | QTE_REVISION=5 |
63 | QTE_REVISION=5 |
60 | endif |
64 | endif |
61 | export QTE_REVISION |
65 | export QTE_REVISION |
62 | |
66 | |
63 | export DEB_VERSION=2.0 |
67 | export DEB_VERSION=2.0 |
64 | |
68 | |
65 | ifeq ($(QTE_BASEVERSION),) |
69 | ifeq ($(QTE_BASEVERSION),) |
66 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
70 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
67 | QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') |
71 | QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') |
68 | else |
72 | else |
69 | QTE_BASEVERSION=2.3.5 |
73 | QTE_BASEVERSION=2.3.5 |
|