summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-06-28 20:46:58 +0000
committerMåns Rullgård <mans@mansr.com>2006-06-28 20:46:58 +0000
commit54003e1a707dea428c4dc56d2fdda8180063b122 (patch)
tree074b1fd9330430b537f0d14862d54153b5000ccf
parent76a77ff291aac29f4c6df86dfd7db60e1097fee6 (diff)
get svn version when using separate build tree
Originally committed as revision 5539 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile2
-rwxr-xr-xversion.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 91fa008fe0..9c64009138 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
.PHONY: version.h
version.h:
- $(SRC_PATH)/version.sh
+ $(SRC_PATH)/version.sh "$(SRC_PATH)"
output_example$(EXESUF): output_example.o .libs
$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
diff --git a/version.sh b/version.sh
index 09c0382003..4721a711be 100755
--- a/version.sh
+++ b/version.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-svn_revision=`svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
+svn_revision=`cd "$1" && svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
test $svn_revision || svn_revision=UNKNOWN
NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\""