author | mickeyl <mickeyl> | 2003-12-09 23:01:54 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-09 23:01:54 (UTC) |
commit | b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6 (patch) (unidiff) | |
tree | 061c027992e37c407ab92d19808833d0639ea3a6 /Vars.make | |
parent | 6b45c1f8e0293914c1328f15a665d2ea0fba7b43 (diff) | |
download | opie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.zip opie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.tar.gz opie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.tar.bz2 |
adjust and update some variables
-rw-r--r-- | Vars.make | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -47,9 +47,9 @@ ifeq ($(QPE_VERSION),) | |||
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=0.9.3 | 51 | QPE_VERSION=1.1.0 |
52 | endif | 52 | endif |
53 | endif | 53 | endif |
54 | export QPE_VERSION | 54 | export QPE_VERSION |
55 | 55 | ||
@@ -66,9 +66,9 @@ ifneq ($(strip $(SUB_VERSION)),) | |||
66 | EXTRAVERSION=-$(SUB_VERSION) | 66 | EXTRAVERSION=-$(SUB_VERSION) |
67 | endif | 67 | endif |
68 | 68 | ||
69 | ifeq ($(QTE_REVISION),) | 69 | ifeq ($(QTE_REVISION),) |
70 | QTE_REVISION=5 | 70 | QTE_REVISION=6 |
71 | endif | 71 | endif |
72 | export QTE_REVISION | 72 | export QTE_REVISION |
73 | 73 | ||
74 | export DEB_VERSION=2.0 | 74 | export DEB_VERSION=2.0 |
@@ -76,18 +76,18 @@ export DEB_VERSION=2.0 | |||
76 | ifeq ($(QTE_BASEVERSION),) | 76 | ifeq ($(QTE_BASEVERSION),) |
77 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 77 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
78 | 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/;') | 78 | 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/;') |
79 | else | 79 | else |
80 | QTE_BASEVERSION=2.3.5 | 80 | QTE_BASEVERSION=2.3.7 |
81 | endif | 81 | endif |
82 | endif | 82 | endif |
83 | export QTE_BASEVERSION | 83 | export QTE_BASEVERSION |
84 | 84 | ||
85 | ifeq ($(QTE_VERSION),) | 85 | ifeq ($(QTE_VERSION),) |
86 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 86 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
87 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') | 87 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
88 | else | 88 | else |
89 | QTE_VERSION=2.3.5 | 89 | QTE_VERSION=2.3.7 |
90 | endif | 90 | endif |
91 | endif | 91 | endif |
92 | export QTE_VERSION | 92 | export QTE_VERSION |
93 | 93 | ||