mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Don't patch popen-noshell twice
This commit is contained in:
2
Makefile
2
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
|
||||
|
||||
@@ -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
|
||||
___________________________________________________________________
|
||||
|
||||
Reference in New Issue
Block a user