mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-10-28 10:04:37 +08:00
ffbuild/version.sh: rename VERSION file to FF_VERSION
This avoids conflicts with the C++ version header. Fix #22574
This commit is contained in:
1 parent
94083a44c9
commit
72e5fc4b80
1 file changed
+2
-2
+2
-2
@@ -34,8 +34,8 @@ test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null)
|
||||
# Append the Git hash if we have one
|
||||
test "$revision" && test "$git_hash" && revision="$revision-$git_hash"
|
||||
|
||||
# releases extract the version number from the VERSION file
|
||||
version=$(cd "$1" && cat VERSION 2> /dev/null)
|
||||
# releases extract the version number from the FF_VERSION file
|
||||
version=$(cd "$1" && cat FF_VERSION 2> /dev/null)
|
||||
test "$version" || version=$revision
|
||||
|
||||
test -n "$3" && version=$version-$3
|
||||
|
||||
Reference in new issue
Block a user