From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 13 Dec 2012 19:46:09 +0000 (+0100)
Subject: maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
X-Git-Tag: v1.12.6~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6432f117500714a6d3df5cab7c9b23275b46be5e;p=thirdparty%2Fautomake.git

maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format

This is a fixup for commit v1.12.5-27-g71ce1b4 of 2012-12-09, "fetch:
improve, and reduce code duplication".

* Makefile.am (update-copyright): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/Makefile.am b/Makefile.am
index 22a8fbd14..89d747f7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1045,8 +1045,10 @@ update-copyright:
 	  || { echo "$@: cannot get current year" >&2; exit 1; }; \
 	sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
 	  bootstrap.sh configure.ac; \
-	excluded_re=`echo $(FETCHFILES) \
-	  | sed -e 's|^.*/|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \
+	excluded_re=`\
+	  for url in $(FETCHFILES); do echo "$$url"; done \
+	    | sed -e 's!^.*/!!' -e 's!^.*=!!' -e 's!^!lib/!' \
+	    | sed -e '$$!s,$$,|,' | tr -d '\012\015'`; \
 	$(GIT) ls-files \
 	  | grep -Ev '^(lib/)?(COPYING|INSTALL)$$' \
 	  | grep -Ev "^($$excluded_re)$$" \