From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 6 Aug 2012 20:13:30 +0000 (+0200)
Subject: Fix scan source for version
X-Git-Tag: Release-5.2.13~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=50b537d4dd55637d65992153752164a63e2a90f5;p=bacula%2Fdocs

Fix scan source for version
---

diff --git a/docs/autoconf/configure.in b/docs/autoconf/configure.in
index 7a9d11e9..270f78eb 100644
--- a/docs/autoconf/configure.in
+++ b/docs/autoconf/configure.in
@@ -33,8 +33,8 @@ if test "x$bacula" = "x" ; then
 fi
 
 dnl Bacula version
-VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${bacula}/src/version.h`
-DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' ${bacula}/src/version.h`
+VERSION=`sed -n -e 's/^#define VERSION.*"\(.*\)"$/\1/p' ${bacula}/src/version.h`
+DATE=`sed -n -e 's/^#define BDATE.*"\(.*\)"$/\1/p' ${bacula}/src/version.h`
 AC_SUBST(VERSION)dnl 
 AC_SUBST(DATE)dnl 
 if test "x$VERSION" = "x" ; then
diff --git a/docs/manuals/update_version.in b/docs/manuals/update_version.in
index 00122801..38831b28 100644
--- a/docs/manuals/update_version.in
+++ b/docs/manuals/update_version.in
@@ -3,8 +3,8 @@
 # Script file to update the Bacula version
 #
 out=/tmp/$$
-VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' @bacula@/src/version.h`
-DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' @bacula@/src/version.h`
+VERSION=`sed -n -e 's/^#define VERSION.*"\(.*\)"$/\1/p' @bacula@/src/version.h`
+DATE=`sed -n -e 's/^#define BDATE.*"\(.*\)"$/\1/p' @bacula@/src/version.h`
 . @BUILD_DIR@/manuals/do_echo
 sed -f ${out} @BUILD_DIR@/manuals/version.tex.in >version.tex
 rm -f ${out}