summaryrefslogtreecommitdiff
path: root/Vars.make
authormickeyl <mickeyl>2003-12-09 23:01:54 (UTC)
committer mickeyl <mickeyl>2003-12-09 23:01:54 (UTC)
commitb2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6 (patch) (side-by-side diff)
tree061c027992e37c407ab92d19808833d0639ea3a6 /Vars.make
parent6b45c1f8e0293914c1328f15a665d2ea0fba7b43 (diff)
downloadopie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.zip
opie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.tar.gz
opie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.tar.bz2
adjust and update some variables
Diffstat (limited to 'Vars.make') (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make8
1 files changed, 4 insertions, 4 deletions
diff --git a/Vars.make b/Vars.make
index 1a5d9d4..a58801e 100644
--- a/Vars.make
+++ b/Vars.make
@@ -45,13 +45,13 @@ ifeq ($(QPE_VERSION),)
VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
ifeq ($(QPE_VERSION),..)
- QPE_VERSION=0.9.3
+ QPE_VERSION=1.1.0
endif
endif
export QPE_VERSION
SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
ifeq ($(VERSION_CVS),)
@@ -64,32 +64,32 @@ export SUB_VERSION
ifneq ($(strip $(SUB_VERSION)),)
EXTRAVERSION=-$(SUB_VERSION)
endif
ifeq ($(QTE_REVISION),)
- QTE_REVISION=5
+ QTE_REVISION=6
endif
export QTE_REVISION
export DEB_VERSION=2.0
ifeq ($(QTE_BASEVERSION),)
ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
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/;')
else
- QTE_BASEVERSION=2.3.5
+ QTE_BASEVERSION=2.3.7
endif
endif
export QTE_BASEVERSION
ifeq ($(QTE_VERSION),)
ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
else
- QTE_VERSION=2.3.5
+ QTE_VERSION=2.3.7
endif
endif
export QTE_VERSION
export PATH:=$(OPIEDIR)/scripts:$(PATH)
export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))