# HG changeset patch # User Jiri Denemark # Date 1264080197 -3600 # Node ID 941bc79810530cf9a5b4f7949a9e61ea8745c5c5 # Parent 2c14f1e449e5c0b3161abce9e6c88c42857f279f maint.mk: fix VC_LIST_EXCEPT for srcdir != builddir * top/maint.mk (VC_LIST_EXCEPT): Preprocess the output of $(VC_LIST) to remove a prefix of '$(srcdir)/', so that it works from a non-srcdir build. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-21 Jiri Denemark + + maint.mk: fix VC_LIST_EXCEPT for srcdir != builddir + * top/maint.mk (VC_LIST_EXCEPT): Preprocess the output of + $(VC_LIST) to remove a prefix of '$(srcdir)/', so that it works + from a non-srcdir build. + 2010-01-20 Eric Blake warn-on-use: use instead of link-warning diff --git a/top/maint.mk b/top/maint.mk --- a/top/maint.mk +++ b/top/maint.mk @@ -41,9 +41,11 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$ VC_LIST_EXCEPT = \ - $(VC_LIST) | 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)' + $(VC_LIST) | sed 's|^$(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)/|' ifeq ($(origin prev_version_file), undefined) prev_version_file = $(srcdir)/.prev-version