summaryrefslogtreecommitdiff
path: root/Makefile.maint
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-07-09 19:24:15 +0200
committerJim Meyering <jim@meyering.net>2007-07-09 19:24:15 +0200
commit578332c0e2a2a2c843f27a5bc18275c84e491763 (patch)
tree8769b463b41e82132c6a4caea4444038292430d5 /Makefile.maint
parent86e4b778b148bdd82395fdc312ce8d937f303e33 (diff)
downloadcoreutils-578332c0e2a2a2c843f27a5bc18275c84e491763.tar.xz
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.
Diffstat (limited to 'Makefile.maint')
-rw-r--r--Makefile.maint4
1 files changed, 2 insertions, 2 deletions
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'; \