diff options
Diffstat (limited to 'packaging/bin/fill-templates')
| -rwxr-xr-x | packaging/bin/fill-templates | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packaging/bin/fill-templates b/packaging/bin/fill-templates index e74020fb69..204003c53b 100755 --- a/packaging/bin/fill-templates +++ b/packaging/bin/fill-templates @@ -13,7 +13,7 @@ # License: GPL DIRNAME=$(dirname $0) -TOPDIR=${DIRNAME}/../../ +TOPDIR=${DIRNAME}/../.. SRCDIR=${TOPDIR}/source3 VERSION_H=${SRCDIR}/include/version.h @@ -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 @@ -43,5 +43,5 @@ VERSION=`echo ${VERSION} | sed 's/\"//g'` echo "VERSION: ${VERSION}" pushd ${TOPDIR}/packaging > /dev/null 2>&1 -${TOPDIR}/packaging/bin/update-pkginfo "${VERSION}" 1 "" +./bin/update-pkginfo "${VERSION}" 1 "" popd > /dev/null 2>&1 |