From ca8c6cf43096f9ee20fb4a90ec1867301b9a411d Mon Sep 17 00:00:00 2001 From: ntfreak Date: Fri, 13 Feb 2009 09:56:51 +0000 Subject: [PATCH] - 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 --- guess-rev.sh | 3 +-- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/guess-rev.sh b/guess-rev.sh index c561be56e..aee6770df 100755 --- a/guess-rev.sh +++ b/guess-rev.sh @@ -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 - diff --git a/src/Makefile.am b/src/Makefile.am index 30b67f269..a49957948 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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