[Gnucash-changes] r12344 - gnucash/trunk - Revert 12296 -- provide a better fix for gentoo ebuild.

[Derek Atkins]

Author: warlord
Date: 2006-01-13 16:50:36 -0500 (Fri, 13 Jan 2006)
New Revision: 12344
Trac: http://svn.gnucash.org/trac/changeset/12344

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/gnome-utils/Makefile.am
Log:
Revert 12296 -- provide a better fix for gentoo ebuild.

	* src/gnome-utils/Makefile.am: revert 12296 and handle the
	  case of an svn checkout without .svn subdirs (gentoo ebuild).
	  In particular, we want to use $(srcdir)/gnc-svninfo.h
	  so that a build from a dist tarball has the svn version.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-13 21:19:59 UTC (rev 12343)
+++ gnucash/trunk/ChangeLog	2006-01-13 21:50:36 UTC (rev 12344)
@@ -1,5 +1,12 @@
-2006-02-13  Neil Williams <linux at codehelp.co.uk>
+2006-01-13  Derek Atkins  <derek at ihtfp.com>
 
+	* src/gnome-utils/Makefile.am: revert 12296 and handle the
+	  case of an svn checkout without .svn subdirs (gentoo ebuild).
+	  In particular, we want to use $(srcdir)/gnc-svninfo.h
+	  so that a build from a dist tarball has the svn version.
+
+2006-01-13  Neil Williams <linux at codehelp.co.uk>
+
 	* src/bin/test/test-version : Using Derek's fix to
 	resolve the test failure.
 

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2006-01-13 21:19:59 UTC (rev 12343)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2006-01-13 21:50:36 UTC (rev 12344)
@@ -273,7 +273,12 @@
 		echo "/* Autogenerated. Do not change. */" > _gnc-svninfo.h ; \
 		echo "#define GNUCASH_SVN_REV \"$$svninfo\"" >> _gnc-svninfo.h ; \
 	else \
-		echo "#define GNUCASH_SVN_REV \"unknown\"" > _gnc-svninfo.h ; \
+		if [ -r $(srcdir)/gnc-svninfo.h ] ; then \
+			cp $(srcdir)/gnc-svninfo.h _gnc-svninfo.h ; \
+		else
+			echo "/* Autogenerated. Do not change. */" > _gnc-svninfo.h ; \
+			echo "#define GNUCASH_SVN_REV \"unknown -- bad svn checkout?\"" >> _gnc-svninfo.h ; \
+		fi ; \
 	fi
 
 BUILT_SOURCES = gnc-dir.h gnc-version.h