- guess-rev.sh now works as expected when build_dir is not the same as src_dir
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Fri, 13 Feb 2009 09:56:51 +0000 (09:56 +0000)
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Fri, 13 Feb 2009 09:56:51 +0000 (09:56 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@1372 b42882b7-edfa-0310-969c-e2dbd0fdcd60

guess-rev.sh
src/Makefile.am

index c561be5..aee6770 100755 (executable)
@@ -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
-
index 30b67f2..a499579 100644 (file)
@@ -21,7 +21,7 @@ openocd_CPPFLAGS = \
 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