1 |
xmw 10/08/30 12:03:38 |
2 |
|
3 |
Added: mupdf-0.7-buildsystem.patch |
4 |
Log: |
5 |
version bump to 0.7 |
6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-text/mupdf/files/mupdf-0.7-buildsystem.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-0.7-buildsystem.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-0.7-buildsystem.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: mupdf-0.7-buildsystem.patch |
15 |
=================================================================== |
16 |
--- Makefile.orig 2010-08-30 13:49:42.022000015 +0200 |
17 |
+++ Makefile 2010-08-30 13:51:30.274000015 +0200 |
18 |
@@ -6,7 +6,8 @@ |
19 |
default: all |
20 |
|
21 |
build ?= debug |
22 |
-prefix ?= /usr/local |
23 |
+prefix ?= /usr |
24 |
+libprefix ?= $(prefix)/lib |
25 |
|
26 |
OBJDIR := build/$(build) |
27 |
GENDIR := build/generated |
28 |
@@ -378,7 +379,7 @@ |
29 |
rm -rf build |
30 |
|
31 |
install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS) |
32 |
- install -d $(prefix)/bin $(prefix)/lib $(prefix)/include |
33 |
+ install -d $(prefix)/bin $(libprefix) $(prefix)/include |
34 |
install $(APPS) $(prefix)/bin |
35 |
- install $(MUPDF_LIB) $(prefix)/lib |
36 |
+ install $(MUPDF_LIB) $(libprefix) |
37 |
install $(MUPDF_HDR) $(prefix)/include |
38 |
--- Makerules.orig 2010-08-30 13:52:12.870000016 +0200 |
39 |
+++ Makerules 2010-08-30 13:54:08.731000014 +0200 |
40 |
@@ -4,8 +4,8 @@ |
41 |
OS := $(OS:MINGW%=MINGW) |
42 |
|
43 |
CC ?= cc |
44 |
-CFLAGS := -Ifitz -Imupdf -Wall |
45 |
-LDFLAGS := |
46 |
+CFLAGS += -Ifitz -Imupdf |
47 |
+LDFLAGS += |
48 |
|
49 |
ifeq "$(build)" "debug" |
50 |
CFLAGS += -pipe -g |
51 |
@@ -21,7 +21,7 @@ |
52 |
|
53 |
ifeq "$(OS)" "Linux" |
54 |
SYS_FREETYPE_INC := `pkg-config --cflags freetype2` |
55 |
-X11LIBS := -lX11 -lXext |
56 |
+X11LIBS := `pkg-config --libs x11 xext` |
57 |
PDFVIEW_EXE = $(X11VIEW_EXE) |
58 |
endif |