[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/2] top/maint.mk: Fix VC_LIST_EXCEPT for srcdir != builddir
From: |
Jim Meyering |
Subject: |
Re: [PATCH 1/2] top/maint.mk: Fix VC_LIST_EXCEPT for srcdir != builddir |
Date: |
Sat, 23 Jan 2010 22:14:35 +0100 |
Eric Blake wrote:
> According to Jim Meyering on 1/23/2010 11:28 AM:
>>> location of '../' got turned into '../../'.
>>
>> Thanks!
>> Looks like I introduced that.
>> This seems to fix the original problem without breaking anything.
>> I'll push it after a little more testing:
>
> It works for me at any rate. Thanks for the quick fix.
[actually, it was not right, since the sed lacked the 'g' modifier]
Here's an even better way.
Just pushed.
>From a3d5e7d237ce6fb927e00ee916892716eb69b997 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 23 Jan 2010 22:08:55 +0100
Subject: [PATCH] maint.mk: fix syntax-check in a non-srcdir build directory
* top/maint.mk (_dot_escaped_srcdir): Remove erroneous backslash,
introduced in my 2010-01-21 commit, a6da6c45. Reported by Eric Blake.
---
ChangeLog | 6 ++++++
top/maint.mk | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0ced685..e85062f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-23 Jim Meyering <address@hidden>
+
+ maint.mk: fix syntax-check in a non-srcdir build directory
+ * top/maint.mk (_dot_escaped_srcdir): Remove erroneous backslash,
+ introduced in my 2010-01-21 commit, a6da6c45. Reported by Eric Blake.
+
2010-01-22 Jim Meyering <address@hidden>
userspec: add unit tests
diff --git a/top/maint.mk b/top/maint.mk
index 1ef28d3..314abc1 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -43,7 +43,7 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$
# This is to preprocess robustly the output of $(VC_LIST), so that even
# when $(srcdir) is a pathological name like "....", the leading sed command
# removes only the intended prefix.
-_dot_escaped_srcdir = $(subst .,\\.,$(srcdir))
+_dot_escaped_srcdir = $(subst .,\.,$(srcdir))
VC_LIST_EXCEPT = \
$(VC_LIST) | sed 's|^$(_dot_escaped_srcdir)/||' \
--
1.6.6.1.557.g77031