summaryrefslogtreecommitdiff
path: root/source3/script
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-03-19 23:55:21 +0100
committerMichael Adam <obnox@samba.org>2009-03-19 23:57:34 +0100
commitd813a90d1887958085adf92c88359dc866c656ad (patch)
tree012e5cd8d5b9c0fbc45df4a1f1578339ea719f74 /source3/script
parentf603903cb01f0c1e8bba66ab8c5229c3e7724ae3 (diff)
downloadsamba-d813a90d1887958085adf92c88359dc866c656ad.tar.gz
samba-d813a90d1887958085adf92c88359dc866c656ad.tar.bz2
samba-d813a90d1887958085adf92c88359dc866c656ad.zip
version: fix handling of SAMBA_VERSION_VENDOR_PATCH.
We need a string version of this, or else version.c does not compile. Michael
Diffstat (limited to 'source3/script')
-rwxr-xr-xsource3/script/mkversion.sh3
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 */