From 578332c0e2a2a2c843f27a5bc18275c84e491763 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Mon, 9 Jul 2007 19:24:15 +0200
Subject: Compensate for new c99'isms in seq.c. * Makefile.maint (patch-check):
 Use -p1, not -p2, so a patch generated via "make patch-check REGEN=1"
 actually works. * src/c99-to-c89.diff: Handle new c99'isms in seq.c.

---
 Makefile.maint | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile.maint')

diff --git a/Makefile.maint b/Makefile.maint
index 04efbc297..3bdfeac3b 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -359,10 +359,10 @@ sc_useless_cpp_parens:
 patch-check:
 	rm -rf src-c89 $@.1 $@.2
 	cp -a src src-c89
-	(cd src-c89; patch -p2 -V never --fuzz=0) < src/c99-to-c89.diff \
+	(cd src-c89; patch -p1 -V never --fuzz=0) < src/c99-to-c89.diff \
 	  > $@.1 2>&1
 	if test "$${REGEN_PATCH+set}" = set; then \
-	  diff -upr src src-c89 > new-diff || : ; fi
+	  diff -upr src src-c89 | sed 's,src-c89/,src/,' > new-diff || : ; fi
 	grep -v '^patching file ' $@.1 > $@.2 || :
 	msg=ok; test -s $@.2 && msg='fuzzy patch' || : ;	\
 	rm -f src-c89/*.o || msg='rm failed';			\
-- 
cgit v1.2.3-54-g00ecf