Fix build scripts to work with non-GNU tools

diff --git a/Makefile b/Makefile
index 24cf324d0abf90a7edba4e65ee6a8caeb8474e68..793a58a48be4df076c640b3eb61ed89631d1e7be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -193,8 +193,10 @@ distclean: clean
        rm -rf test/
 
 install: x264$(EXE) $(SONAME)
-       install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
-       install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
+       install -d $(DESTDIR)$(bindir)
+       install -d $(DESTDIR)$(includedir)
+       install -d $(DESTDIR)$(libdir)
+       install -d $(DESTDIR)$(libdir)/pkgconfig
        install -m 644 x264.h $(DESTDIR)$(includedir)
        install -m 644 libx264.a $(DESTDIR)$(libdir)
        install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
@@ -203,7 +205,7 @@ install: x264$(EXE) $(SONAME)
 ifeq ($(SYS),MINGW)
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
 else
-       $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
+       $(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
 endif
        $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))

diff --git a/version.sh b/version.sh
index c8778470f6fa4db327a4cab452376cbbe8e10f84..03b070b2e6885b5ebe3bf871e2056858038dd649 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -8,7 +8,7 @@ if [ $LOCALVER \> 1 ] ; then
     elif git status | grep -q "modified:" ; then
         VER="${VER}M"
     fi
-    VER="$VER $(git rev-list HEAD -n 1 | head -c 7)"
+    VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
     echo "#define X264_VERSION \" r$VER\"" >> config.h
 else
     echo "#define X264_VERSION \"\"" >> config.h