[vlc-devel] commit: Make patching more resilient (Christophe Mutricy )

git version control git at videolan.org
Sun Aug 3 01:37:04 CEST 2008


vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Sat Aug  2 19:18:54 2008 +0100| [cdd2ad93fe897e9f1e4d311ddc77c67b03d62627] | committer: Christophe Mutricy 

Make patching more resilient

In case autopoint hasn't replaced our Makefile.in.in

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cdd2ad93fe897e9f1e4d311ddc77c67b03d62627
---

 bootstrap |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bootstrap b/bootstrap
index ea59f16..33778ab 100755
--- a/bootstrap
+++ b/bootstrap
@@ -113,7 +113,7 @@ echo > ABOUT-NLS
 mv -f INSTALL.git INSTALL
 
 # Patch po/Makefile.in.in but it's not a drama if it fails
-patch -p1 < po/makefile-qt4.patch || true
+patch -sfN -p1 < po/makefile-qt4.patch || true
 
 ##
 ##  files which need to be regenerated




More information about the vlc-devel mailing list