diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-20 10:01:17 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-20 10:01:17 +1100 |
| commit | 9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3 (patch) | |
| tree | 94bd92a2eec2f966577ebba35468530b1f315aba /source3/script | |
| parent | 844a1b3cd27f323087b707e494c5e3860340eb27 (diff) | |
| parent | 3a4638db0351368d3b148bf547546f28fa0b1479 (diff) | |
| download | samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.tar.gz samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.tar.bz2 samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/script')
| -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 a55aafcd0c..ce9d2af4c0 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 */ |