From: Christophe Mutricy <xtophe@videolan.org>
Date: Sat, 2 Aug 2008 18:18:54 +0000 (+0100)
Subject: Make patching more resilient
X-Git-Tag: 0.9.0~655
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=cdd2ad93fe897e9f1e4d311ddc77c67b03d62627;p=vlc

Make patching more resilient

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

diff --git a/bootstrap b/bootstrap
index ea59f16bf8..33778ab7ac 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