r1779 - trunk/packages/mc

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Dec 10 22:10:27 PST 2006


Author: alexander
Date: 2006-12-10 23:10:27 -0700 (Sun, 10 Dec 2006)
New Revision: 1779

Modified:
   trunk/packages/mc/Makefile
Log:
Use more robust patch handling while building MC


Modified: trunk/packages/mc/Makefile
===================================================================
--- trunk/packages/mc/Makefile	2006-12-10 12:50:44 UTC (rev 1778)
+++ trunk/packages/mc/Makefile	2006-12-11 06:10:27 UTC (rev 1779)
@@ -30,7 +30,11 @@
 	rm debian/patches/08_awk.patch
 	rm debian/patches/36_developer_mode.patch
 	for a in debian/patches/*.patch ; do \
-	    echo $$a ; patch --force -Np1 -i $$a || patch -Np0 -i $$a ; \
+	    if egrep -q '+++.*mc-4' $$a ; then \
+		patch -Np1 -i $$a ; \
+	    else \
+		patch -Np0 -i $$a ; \
+	    fi ; \
 	done
 	CPPFLAGS="-DUTF8" ./configure --with-screen=slang --prefix=/usr \
 	    --enable-charset




More information about the livecd mailing list