- guess-rev.sh now works as expected when build_dir is not the same as src_dir

git-svn-id: svn://svn.berlios.de/openocd/trunk@1372 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/guess-rev.sh b/guess-rev.sh
index c561be56e83e21307aa581f5a99b072c3b47963e..aee6770df4ef97fb1b28e901f9c20101bf5496e6 100755 (executable)
--- a/guess-rev.sh
+++ b/guess-rev.sh
@@ -3,7 +3,6 @@
 
 REV=unknown
 
 
 REV=unknown
 

-which svnversion > /dev/null 2>&1 && REV=`svnversion -n`
+which svnversion > /dev/null 2>&1 && REV=`svnversion -n "$1"`

 
 echo -n $REV
 
 echo -n $REV

-

diff --git a/src/Makefile.am b/src/Makefile.am
index 30b67f2693215ea90f2cf69cfb01fd6fe278dc17..a49957948e269f12eee4c65008e161de576a4509 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ openocd_CPPFLAGS = \
 if RELEASE
 openocd_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"
 else
 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
 endif
 
 # add default CPPFLAGS