diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-03-02 17:28:43 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-03-02 17:28:43 +0000 |
| commit | 2449bf2db5bc62051d11872d511ed3288c041b0c (patch) | |
| tree | ca03e07564b43d9cd02829eea9f7045817ed384f /packaging | |
| parent | d3b6887d80c0b79ad9c1a248942d05359619cbbb (diff) | |
If the VERSION_EXTRA is set in config.nmake, this can lead to an invalid U3 package version in the manifest file.
So we now create the U3 package version from the base components.
svn path=/trunk/; revision=20957
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index 2245680ef1..a87b9b1ff8 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -20,10 +20,12 @@ COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y +U3_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO) + all: package manifest.u3i: manifest.tmpl $(TOPDIR)\config.nmake - sed -e 's/$$(VERSION)/$(VERSION)/g' < manifest.tmpl > manifest.u3i + sed -e 's/$$(VERSION)/$(U3_VERSION)/g' < manifest.tmpl > manifest.u3i host-dirs: if not exist $(HOST) $(MKDIR) $(HOST) |