From: Alex Jurkiewicz Date: Thu, 20 May 2010 07:01:37 +0000 (+0800) Subject: Modify version.sh to output to stdout. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a3b4aded728e162cb9a59befd0a3da3553bee7a;p=libx264 Modify version.sh to output to stdout. Update configure to match. --- diff --git a/configure b/configure index d02d2d41..e9e45cd1 100755 --- a/configure +++ b/configure @@ -684,7 +684,7 @@ if [ "$shared" = "yes" ]; then echo 'default: $(SONAME)' >> config.mak fi -./version.sh +./version.sh >> config.h pclibs="-L$libdir -lx264 $libpthread" diff --git a/version.sh b/version.sh index 03b070b2..b7772095 100755 --- a/version.sh +++ b/version.sh @@ -9,11 +9,11 @@ if [ $LOCALVER \> 1 ] ; then VER="${VER}M" fi VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)" - echo "#define X264_VERSION \" r$VER\"" >> config.h + echo "#define X264_VERSION \" r$VER\"" else - echo "#define X264_VERSION \"\"" >> config.h + echo "#define X264_VERSION \"\"" VER="x" fi rm -f config.git-hash API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'` -echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h +echo "#define X264_POINTVER \"0.$API.$VER\""