maint.mk: do not prepend "./" after filtering

* top/maint.mk (_prepend_srcdir_prefix): New variable
(VC_LIST_EXCEPT): Use it to avoid prepending (post-filter)
"./" when $(srcdir) is ".".

diff --git a/ChangeLog b/ChangeLog
index 373a1bb092d51000e68fbd9f4b4cc57f63a98e21..813ae48dbe7126459a00c95bc2aa002a008027c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-01-24  Jim Meyering  <meyering@redhat.com>
 
+       maint.mk: do not prepend "./" after filtering
+       * top/maint.mk (_prepend_srcdir_prefix): New variable
+       (VC_LIST_EXCEPT): Use it to avoid prepending (post-filter)
+       "./" when $(srcdir) is ".".
+
        define STREQ(a,b) consistently, removing useless parentheses
        #define STREQ(a, b) (strcmp ((a), (b)) == 0) is over-parenthesized,
        since the only risk is that "a" or "b" contains an unparenthesized

diff --git a/top/maint.mk b/top/maint.mk
index 314abc11b74100c6db51a4346808052af2fbfdd7..346d6813bd9710f2c9ff238ea8d2c5a70502b9f0 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -45,12 +45,23 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$
 # removes only the intended prefix.
 _dot_escaped_srcdir = $(subst .,\.,$(srcdir))
 
+# Post-process $(VC_LIST) output, prepending $(srcdir)/, but only
+# when $(srcdir) is not ".".
+ifeq ($(srcdir),.)
+_prepend_srcdir_prefix =
+else
+_prepend_srcdir_prefix = | sed 's|^|$(srcdir)/|'
+endif
+
+# In order to be able to consistently filter "."-relative names,
+# (i.e., with no $(srcdir) prefix), this definition is careful to
+# remove any $(srcdir) prefix, and to restore what it removes.
 VC_LIST_EXCEPT = \
   $(VC_LIST) | sed 's|^$(_dot_escaped_srcdir)/||' \
        | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
          else grep -Ev -e "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
        | grep -Ev -e '$(VC_LIST_ALWAYS_EXCLUDE_REGEX)' \
-       | sed 's|^|$(srcdir)/|'
+       $(_prepend_srcdir_prefix)
 
 ifeq ($(origin prev_version_file), undefined)
   prev_version_file = $(srcdir)/.prev-version