summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-26 21:51:55 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-26 21:51:55 +0000
commit41129ddc21838078268b4b78367b76c3ed396524 (patch)
tree4ae81a95a7190b465237b80cd09506d95177eba3 /sys-power/apcupsd
parentreset umask #159111 (diff)
downloadgentoo-2-41129ddc21838078268b4b78367b76c3ed396524.tar.gz
gentoo-2-41129ddc21838078268b4b78367b76c3ed396524.tar.bz2
gentoo-2-41129ddc21838078268b4b78367b76c3ed396524.zip
replace with version i sent upstream #159108
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'sys-power/apcupsd')
-rw-r--r--sys-power/apcupsd/files/3.12.4/exit-status-build.patch21
1 files changed, 16 insertions, 5 deletions
diff --git a/sys-power/apcupsd/files/3.12.4/exit-status-build.patch b/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
index bce950448336..c397d9cc3bad 100644
--- a/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
+++ b/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
@@ -1,15 +1,26 @@
if a subdir fails, we need to abort
---- autoconf/targets.mak
-+++ autoconf/targets.mak
-@@ -20,9 +20,7 @@
+Index: autoconf/targets.mak
+===================================================================
+RCS file: /cvsroot/apcupsd/apcupsd/autoconf/targets.mak,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -p -r1.21 -r1.22
+--- autoconf/targets.mak 21 Sep 2006 00:07:35 -0000 1.21
++++ autoconf/targets.mak 20 Dec 2006 01:46:11 -0000 1.22
+@@ -22,10 +22,11 @@ all-subdirs:
+ @if test ! x"$(subdirs)" = x; then \
for file in . ${subdirs}; \
do \
- (cd $$file && if test "$$file" != "."; then $(MAKE) DESTDIR=$(DESTDIR) all; fi); \
+- (cd $$file && if test "$$file" != "."; then $(MAKE) DESTDIR=$(DESTDIR) all; fi); \
- if test "$$?" != "0"; then \
- break; \
- fi; \
-+ test "$$?" != "0" && exit 1 ; \
++ (cd $$file; \
++ if test "$$file" != "."; then \
++ $(MAKE) DESTDIR=$(DESTDIR) all || exit $$?; \
++ fi; \
++ ) || exit $$?; \
done; \
fi