don't use gnu extensions to grep and sed.

git-svn-id: svn://svn.videolan.org/x264/trunk@380 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Makefile b/Makefile
index 72befd9d83931270e3609f5f417d9e3f4b7a50a5..54de91ea95eb0069b93331bd538ba834f66838b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -106,26 +106,27 @@ fprofiled:
 else
 fprofiled:
        make clean
-       sed -i -e 's/CFLAGS.*/& -fprofile-generate/; s/LDFLAGS.*/& -fprofile-generate/' config.mak
+       mv config.mak config.mak2
+       sed -e 's/CFLAGS.*/& -fprofile-generate/; s/LDFLAGS.*/& -fprofile-generate/' config.mak2 > config.mak
        make x264$(EXE)
        $(foreach V, $(VIDS), $(foreach I, 0 1 2, ./x264$(EXE) $(OPT$I) $(V) --progress -o $(DEVNULL) ;))
        rm -f $(SRC2:%.c=%.o)
-       sed -i -e 's/-fprofile-generate/-fprofile-use/' config.mak
+       sed -e 's/CFLAGS.*/& -fprofile-use/; s/LDFLAGS.*/& -fprofile-use/' config.mak2 > config.mak
        make
        rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
-       sed -i -e 's/ *-fprofile-\(generate\|use\)//g' config.mak
+       mv config.mak2 config.mak
 endif
 
 clean:
-       rm -f $(OBJS) $(OBJASM) config.h *.a x264.o matroska.o x264 x264.exe .depend TAGS x264.pc
+       rm -f $(OBJS) $(OBJASM) config.h *.a x264.o matroska.o x264 x264.exe .depend TAGS
        rm -f checkasm checkasm.exe tools/checkasm.o
        rm -f tools/avc2avi tools/avc2avi.exe tools/avc2avi.o
        rm -rf vfw/build/cygwin/bin
        rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
-       - sed -i -e 's/ *-fprofile-\(generate\|use\)//g' config.mak
+       - sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak
 
 distclean: clean
-       rm -f config.mak vfw/build/cygwin/config.mak
+       rm -f config.mak vfw/build/cygwin/config.mak x264.pc
 
 install: x264
        install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)

diff --git a/version.sh b/version.sh
index 3eb585bb95bd7f49ab0052818ba48f5c88c8cfac..f302be4544fa7c1674d9b9f3bf6c1b367b2ea740 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -3,8 +3,8 @@ VER=`svnversion .`
 if [ "x$VER" != x -a "$VER" != exported ]
 then
   echo "#define X264_VERSION \" svn-$VER\"" > config.h
-  API=`grep '#define X264_BUILD' < x264.h | grep -o '[1-9][0-9]*\>'`
-  VER=`echo $VER | grep -o '^[0-9]*'`
+  API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
+  VER=`echo $VER | sed -e 's/[^0-9].*//'`
   echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h
 else
   echo "#define X264_VERSION \"\"" > config.h