[Openocd-svn] r1372 - in trunk: . src

[ntfreak at B. <nt...@ma...>]

Author: ntfreak
Date: 2009-02-13 10:56:51 +0100 (Fri, 13 Feb 2009)
New Revision: 1372

Modified:
   trunk/guess-rev.sh
   trunk/src/Makefile.am
Log:
- guess-rev.sh now works as expected when build_dir is not the same as src_dir

Modified: trunk/guess-rev.sh
===================================================================
--- trunk/guess-rev.sh	2009-02-12 15:35:03 UTC (rev 1371)
+++ trunk/guess-rev.sh	2009-02-13 09:56:51 UTC (rev 1372)
@@ -3,7 +3,6 @@
 
 REV=unknown
 
-which svnversion > /dev/null 2>&1 && REV=`svnversion -n`
+which svnversion > /dev/null 2>&1 && REV=`svnversion -n "$1"`
 
 echo -n $REV
-

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-02-12 15:35:03 UTC (rev 1371)
+++ trunk/src/Makefile.am	2009-02-13 09:56:51 UTC (rev 1372)
@@ -21,7 +21,7 @@
 if RELEASE
 openocd_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"
 else
-openocd_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\"
+openocd_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
 endif
 
 # add default CPPFLAGS