[ekiga/gnome-2-26] [windows] Check if patches apply cleanly
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/gnome-2-26] [windows] Check if patches apply cleanly
- Date: Sun, 2 May 2010 19:55:34 +0000 (UTC)
commit f8f5a67a9e22f9d87c31e8263c2422a565f1463d
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Sun May 2 21:55:00 2010 +0200
[windows] Check if patches apply cleanly
win32/Makefile | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index d63925c..3002a50 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -413,8 +413,8 @@ else
endif
# apply all ptlib_* patches
cd $(PTLIB_DIR); for i in $(EKIGA_DIR)/win32/diff/ptlib_*; do \
- test `basename $$i` != 'ptlib_*' && patch -p1 <$$i ;\
- done
+ test `basename $$i` != 'ptlib_*' && (patch -p1 <$$i || exit 1) ;\
+ done; true
touch $@
$(PTLIB_DIR)/config.status: binaries $(PTLIB_DIR)/configure
@@ -556,8 +556,8 @@ else
endif
# apply all opal_* patches
cd $(OPAL_DIR); for i in $(EKIGA_DIR)/win32/diff/opal_*; do \
- test `basename $$i` != 'opal_*' && patch -p1 <$$i ;\
- done
+ test `basename $$i` != 'opal_*' && (patch -p1 <$$i || exit 1) ;\
+ done; true
touch $@
$(OPAL_DIR)/config.status: binaries $(OPAL_DIR)/configure
@@ -712,8 +712,8 @@ else
endif
# apply all ekiga_* patches
cd $(EKIGA_DIR); for i in $(EKIGA_DIR)/win32/diff/ekiga_*; do \
- test `basename $$i` != 'ekiga_*' && patch -p1 <$$i ;\
- done
+ test `basename $$i` != 'ekiga_*' && (patch -p1 <$$i || exit 1) ;\
+ done; true
touch $@
$(EKIGA_DIR)/config.status: binaries $(EKIGA_DIR)/configure $(LIBDIR)/$(PTLIB_LIB) $(LIBDIR)/$(OPAL_LIB) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]