diff options
| author | Andreas Schneider <anschneider@suse.de> | 2008-07-17 12:25:31 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-07-17 14:16:19 +0200 |
| commit | 2a8ebdca535aed431d51270a2bdcafce0b55bb12 (patch) | |
| tree | 58ed9b0cb4cc500a80e267a9ce584ff4bda3e3b4 /source3/script | |
| parent | 848558026f8c10366db07053714557a9840e8bc9 (diff) | |
| download | samba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.tar.gz samba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.tar.bz2 samba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.zip | |
Simplify samba_version_string.
This adds a new macro for a vender version function which will be returned
by the samba_version_string() function if defined.
Signed-off-by: Andreas Schneider <anschneider@suse.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit 8b9301fbc73f28c657ec81c605760a0ff7a1973a)
Diffstat (limited to 'source3/script')
| -rwxr-xr-x | source3/script/mkversion.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh index b678476976..695fc7dd9c 100755 --- a/source3/script/mkversion.sh +++ b/source3/script/mkversion.sh @@ -30,6 +30,8 @@ SAMBA_VERSION_RELEASE_NICKNAME=`sed -n 's/^SAMBA_VERSION_RELEASE_NICKNAME=//p' $ SAMBA_VERSION_VENDOR_SUFFIX=`sed -n 's/^SAMBA_VERSION_VENDOR_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE` SAMBA_VERSION_VENDOR_PATCH=`sed -n 's/^SAMBA_VERSION_VENDOR_PATCH=//p' $SOURCE_DIR$VERSION_FILE` +SAMBA_VERSION_VENDOR_FUNCTION=`sed -n 's/^SAMBA_VERSION_VENDOR_FUNCTION=//p' $SOURCE_DIR$VERSION_FILE` + echo "/* Autogenerated by script/mkversion.sh */" > $OUTPUT_FILE echo "#define SAMBA_VERSION_MAJOR ${SAMBA_VERSION_MAJOR}" >> $OUTPUT_FILE @@ -101,6 +103,10 @@ echo "#define SAMBA_VERSION_OFFICIAL_STRING \"${SAMBA_VERSION_STRING}\"" >> $OUT ## ## Add the vendor string if present ## +if test -n "${SAMBA_VERSION_VENDOR_FUNCTION}"; then + echo "#define SAMBA_VERSION_VENDOR_FUNCTION ${SAMBA_VERSION_VENDOR_FUNCTION}" >> $OUTPUT_FILE +fi + if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then echo "#define SAMBA_VERSION_VENDOR_SUFFIX ${SAMBA_VERSION_VENDOR_SUFFIX}" >> $OUTPUT_FILE SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}" |