diff options
| author | Michael Adam <obnox@samba.org> | 2009-03-19 23:55:21 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-15 09:07:27 +0200 |
| commit | 856e44d79a3812167e1813f2e08512f566135d89 (patch) | |
| tree | 1510e546a78332bf463c2964734fcaa01e7af07f /source3/script/mkversion.sh | |
| parent | 38ef3e5947d20c77eef39d3095ed42d7a74174fe (diff) | |
| download | samba-856e44d79a3812167e1813f2e08512f566135d89.tar.gz samba-856e44d79a3812167e1813f2e08512f566135d89.tar.xz samba-856e44d79a3812167e1813f2e08512f566135d89.zip | |
version: fix handling of SAMBA_VERSION_VENDOR_PATCH.
We need a string version of this, or else version.c does not compile.
Michael
(cherry picked from commit 21bf5cac5f352f51432ad717b2e5051a3a63cac9)
Diffstat (limited to 'source3/script/mkversion.sh')
| -rwxr-xr-x | source3/script/mkversion.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh index a55aafcd0c2..ce9d2af4c0d 100755 --- a/source3/script/mkversion.sh +++ b/source3/script/mkversion.sh @@ -112,6 +112,7 @@ if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}" if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then echo "#define SAMBA_VERSION_VENDOR_PATCH ${SAMBA_VERSION_VENDOR_PATCH}" >> $OUTPUT_FILE + echo "#define SAMBA_VERSION_VENDOR_PATCH_STRING \"${SAMBA_VERSION_VENDOR_PATCH}\"" >> $OUTPUT_FILE SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}" fi fi @@ -130,7 +131,7 @@ cat >>$OUTPUT_FILE<<CEOF #else /* SAMBA_VERSION_VENDOR_FUNCTION */ # ifdef SAMBA_VERSION_VENDOR_SUFFIX # ifdef SAMBA_VERSION_VENDOR_PATCH -# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX "-" SAMBA_VERSION_VENDOR_PATCH +# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX "-" SAMBA_VERSION_VENDOR_PATCH_STRING # else /* SAMBA_VERSION_VENDOR_PATCH */ # define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX # endif /* SAMBA_VERSION_VENDOR_SUFFIX */ |