[Gnucash-changes] r14429 - gnucash/trunk/src/gnome-utils - Use gnc-svnversion to detect development version or tarball version

Derek Atkins warlord at cvs.gnucash.org
Sat Jun 24 15:03:21 EDT 2006


Author: warlord
Date: 2006-06-24 15:03:21 -0400 (Sat, 24 Jun 2006)
New Revision: 14429
Trac: http://svn.gnucash.org/trac/changeset/14429

Modified:
   gnucash/trunk/src/gnome-utils/Makefile.am
Log:
Use gnc-svnversion to detect development version or tarball version
Fix a case of a missing variable, missed from the last changeset.

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2006-06-24 18:42:58 UTC (rev 14428)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2006-06-24 19:03:21 UTC (rev 14429)
@@ -246,12 +246,8 @@
 	@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 @@
 	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 ; \



More information about the gnucash-changes mailing list