| author | kergoth <kergoth> | 2003-08-09 19:43:03 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-08-09 19:43:03 (UTC) |
| commit | 102a00422a155cef204977f6bb7b3f530b7b8c19 (patch) (unidiff) | |
| tree | c4add67d773b27cad52c719cc032431cb687c3f9 /Vars.make | |
| parent | 3a53173f75c21417bf7601b60a791f72fbb4631d (diff) | |
| download | opie-102a00422a155cef204977f6bb7b3f530b7b8c19.zip opie-102a00422a155cef204977f6bb7b3f530b7b8c19.tar.gz opie-102a00422a155cef204977f6bb7b3f530b7b8c19.tar.bz2 | |
Merges.
| -rw-r--r-- | Vars.make | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -52,12 +52,16 @@ ifeq ($(VERSION_CVS),) | |||
| 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 |