diff options
author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-02-13 09:56:51 +0000 |
---|---|---|
committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-02-13 09:56:51 +0000 |
commit | ca8c6cf43096f9ee20fb4a90ec1867301b9a411d (patch) | |
tree | b2fd86515d60c26d6c7684307d1c8942f58aade5 | |
parent | 2e160c6bad640297e4e8473b07ecff587c633e27 (diff) |
- 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
-rwxr-xr-x | guess-rev.sh | 3 | ||||
-rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/guess-rev.sh b/guess-rev.sh index c561be56..aee6770d 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 30b67f26..a4995794 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 |