From 4af13ca7c6222d866d36aa01af531eac488a4505 Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Sat, 24 Jun 2006 19:03:21 +0000 Subject: [PATCH] Use gnc-svnversion to detect development version or tarball version Fix a case of a missing variable, missed from the last changeset. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14429 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome-utils/Makefile.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index 05f211ef04..790bdccc75 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -246,12 +246,8 @@ _gnc-version.h: gnc-svninfo.h Makefile @echo "#ifndef GNC_VERSION_H" >> _gnc-version.h @echo "#define GNC_VERSION_H" >> _gnc-version.h @echo "" >> _gnc-version.h - @s=${srcdir} ; \ - if [ -h ${srcdir}/Makefile.am ] ; then \ - d=`readlink $(srcdir)/Makefile.am` ; \ - s="${srcdir}/`dirname $$d`" ; \ - fi ; \ - if [ -d $$s/.svn ] ; then \ + @svninfo=`${top_srcdir}/util/gnc-svnversion ${srcdir}` ; \ + if [ $$? = 0 ] ; then \ echo "#define GNUCASH_SVN 1" >> _gnc-version.h ; \ fi @echo "#define GNUCASH_BUILD_DATE \"`date +%Y-%m-%d`\"" >> _gnc-version.h @@ -268,7 +264,7 @@ _gnc-svninfo.h: Makefile if [ $$? = 0 ] ; then \ if [ -z "$$svninfo" ] ; then \ echo "gnc-svnversion failed. figure out why." ; \ - echo "can't determine svn revision from $$s." ; \ + echo "can't determine svn revision from ${srcdir}." ; \ exit 1 ; \ fi ; \ echo "/* Autogenerated. Do not change. */" > _gnc-svninfo.h ; \