s3:packaging: fix parsing of include.h in fill-templates

The content has changed slightly in master for the merged build,
and we must be more exact when parsing the lines.

Michael

diff --git a/packaging/bin/fill-templates b/packaging/bin/fill-templates
index 537664dd117116292f5cb1a84f5e175cf41d86a1..204003c53b1c5616bd2cb3a2695a2266f5233392 100755 (executable)
--- a/packaging/bin/fill-templates
+++ b/packaging/bin/fill-templates
@@ -26,14 +26,14 @@ if [ ! -f ${VERSION_H} ] ; then
        exit 1
 fi
 
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
+VERSION=`grep "define SAMBA_VERSION_OFFICIAL_STRING" ${VERSION_H} | awk '{print $3}'`
 
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
+vendor_version=`grep "define SAMBA_VERSION_VENDOR_SUFFIX" ${VERSION_H} | awk '{print $3}'`
 if test "x${vendor_version}" != "x" ; then
        VERSION="${VERSION}-${vendor_version}"
 fi
 
-vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
+vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" ${VERSION_H} | awk '{print $3}'`
 if test "x${vendor_patch}" != "x" ; then
        VERSION="${VERSION}-${vendor_patch}"
 fi