Fix scan source for version

diff --git a/docs/autoconf/configure.in b/docs/autoconf/configure.in
index 7a9d11e9f54ab3dfb618dac30386216d92b8737e..270f78eb60dc3e8786fbd503e56f2d64dc6b2dac 100644 (file)
--- 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 00122801ed46b503e9550c55d41fa2c040b84dcf..38831b288133a58be5745a2586ee73ead0d5dbdd 100644 (file)
--- 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}