From 84e107313cf8a29e83f58600410663fac62aa3fc Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Wed, 3 Oct 2012 00:34:42 +0200 Subject: [PATCH] Don't patch popen-noshell twice --- Makefile | 2 +- popen-noshell/popen_noshell-buildfix.patch | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0d2a3db00..388a6cb6e 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,7 @@ fetchthirdparty: cd mupdf && patch -N -p1 < ../mupdf.patch svn co http://popen-noshell.googlecode.com/svn/trunk/ popen-noshell # popen_noshell patch: Make it build on recent TCs, and implement a simple Makefile for building it as a static lib - cd popen-noshell && patch -N -p0 < popen_noshell-buildfix.patch + cd popen-noshell && tesf -f Makefile || patch -N -p0 < popen_noshell-buildfix.patch clean: rm -f *.o kpdfview slider_watcher diff --git a/popen-noshell/popen_noshell-buildfix.patch b/popen-noshell/popen_noshell-buildfix.patch index 6f9ba1bf8..97c09b881 100644 --- a/popen-noshell/popen_noshell-buildfix.patch +++ b/popen-noshell/popen_noshell-buildfix.patch @@ -15,7 +15,7 @@ Index: Makefile =================================================================== --- Makefile (revision 0) +++ Makefile (working copy) -@@ -0,0 +1,15 @@ +@@ -0,0 +1,17 @@ +SRCS=popen_noshell.c + +OBJS:=$(SRCS:%.c=%.o) @@ -31,6 +31,8 @@ Index: Makefile +clean: + rm -rf *.o + rm -rf libpopen_noshell.a ++ ++.PHONY: clean Property changes on: Makefile ___________________________________________________________________