Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/argus/files: argus-3.0.5-Makefile.patch
Date: Tue, 15 Nov 2011 21:18:50
Message-Id: 20111115211838.DB4B12004B@flycatcher.gentoo.org
1 jer 11/11/15 21:18:38
2
3 Modified: argus-3.0.5-Makefile.patch
4 Log:
5 Remove redundant sed script. Tweak Makefile patch to actually die properly.
6
7 (Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 net-analyzer/argus/files/argus-3.0.5-Makefile.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/argus/files/argus-3.0.5-Makefile.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/argus/files/argus-3.0.5-Makefile.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/argus/files/argus-3.0.5-Makefile.patch?r1=1.1&r2=1.2
15
16 Index: argus-3.0.5-Makefile.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/argus/files/argus-3.0.5-Makefile.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- argus-3.0.5-Makefile.patch 15 Nov 2011 20:43:45 -0000 1.1
23 +++ argus-3.0.5-Makefile.patch 15 Nov 2011 21:18:38 -0000 1.2
24 @@ -2,12 +2,19 @@
25
26 --- a/Makefile.in
27 +++ b/Makefile.in
28 -@@ -55,7 +55,7 @@
29 +@@ -55,11 +55,11 @@
30 .PHONY: install installdirs all
31
32 all: force
33 - @-for d in $(DIRS);\
34 + @for d in $(DIRS);\
35 do \
36 - (cd $$d; echo "### Making in" `pwd`;\
37 - $(MAKE) $(MFLAGS) ;\
38 +- (cd $$d; echo "### Making in" `pwd`;\
39 +- $(MAKE) $(MFLAGS) ;\
40 +- echo "### Done with" `pwd`);\
41 ++ echo "### Making in" $$d;\
42 ++ $(MAKE) -C $$d $(MFLAGS) || exit 1;\
43 ++ echo "### Done with" $$d;\
44 + done
45 +
46 + install: force