Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/pacparser/files: pacparser-1.3.1-makefile.patch
Date: Tue, 26 Nov 2013 05:29:41
Message-Id: 20131126052931.64FA620005@flycatcher.gentoo.org
1 bicatali 13/11/26 05:29:31
2
3 Added: pacparser-1.3.1-makefile.patch
4 Log:
5 Initial import
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
8
9 Revision Changes Path
10 1.1 net-libs/pacparser/files/pacparser-1.3.1-makefile.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch?rev=1.1&content-type=text/plain
14
15 Index: pacparser-1.3.1-makefile.patch
16 ===================================================================
17 diff -Nur pacparser-1.3.1.orig/src/Makefile pacparser-1.3.1/src/Makefile
18 --- pacparser-1.3.1.orig/src/Makefile 2013-11-26 04:21:24.000000000 +0000
19 +++ pacparser-1.3.1/src/Makefile 2013-11-26 04:27:11.000000000 +0000
20 @@ -55,7 +55,7 @@
21 endif
22 endif
23
24 -CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
25 +CFLAGS := $(CFLAGS) -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
26
27 ifndef PYTHON
28 PYTHON = python
29 @@ -67,13 +67,14 @@
30
31 LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX)
32 PREFIX := $(DESTDIR)$(PREFIX)
33 -LIB_PREFIX = $(PREFIX)/lib
34 -INC_PREFIX = $(PREFIX)/include
35 -BIN_PREFIX = $(PREFIX)/bin
36 -MAN_PREFIX = $(PREFIX)/share/man
37 +LIB_PREFIX := $(PREFIX)/lib
38 +INC_PREFIX := $(PREFIX)/include
39 +BIN_PREFIX := $(PREFIX)/bin
40 +MAN_PREFIX := $(PREFIX)/share/man
41 +DOC_PREFIX := $(PREFIX)/share/doc/pacparser
42
43 .PHONY: clean pymod install-pymod
44 -all: testpactester
45 +all: pactester
46
47 spidermonkey/js/src: spidermonkey/js-?.?.?.tar.gz
48 tar xzvf spidermonkey/js-?.?.?.tar.gz -C spidermonkey
49 @@ -97,7 +98,7 @@
50 ln -sf $(LIBRARY) $(LIBRARY_LINK)
51
52 pactester: pactester.c pacparser.h $(LIBRARY_LINK)
53 - $(CC) pactester.c -o pactester -lpacparser -L. -I.
54 + $(CC) $(CFLAGS) $(LDFLAGS) pactester.c -o pactester -lpacparser -L. -I.
55
56 testpactester: pactester
57 echo "Running tests for pactester."
58 @@ -118,16 +119,20 @@
59 # install pacparser manpages
60 install -d $(MAN_PREFIX)/man3/
61 (test -d ../docs && install -m 644 ../docs/man/man3/*.3 $(MAN_PREFIX)/man3/) || true
62 +
63 +install-docs:
64 # install html docs
65 - install -d $(PREFIX)/share/doc/pacparser/html/
66 - (test -d ../docs/html && install -m 644 ../docs/html/* $(PREFIX)/share/doc/pacparser/html/) || true
67 + install -d $(DOC_PREFIX)/html/
68 + (test -d ../docs/html && install -m 644 ../docs/html/* $(DOC_PREFIX)/html/) || true
69 # install examples
70 - install -d $(PREFIX)/share/doc/pacparser/examples/
71 - (test -d ../examples && install -m 644 ../examples/* $(PREFIX)/share/doc//pacparser/examples/) || true
72 + install -d $(DOC_PREFIX)/examples/
73 + (test -d ../examples && install -m 644 ../examples/* $(DOC_PREFIX)/examples/) || true
74
75 # Targets to build python module
76 pymod: pacparser.o pacparser.h libjs.a
77 cd pymod && ARCHFLAGS="" $(PYTHON) setup.py build
78 +
79 +test-pymod: pymod
80 $(PYTHON) ../tests/runtests.py
81
82 install-pymod: pymod