From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 28 May 2009 08:58:47 +0000 (+0200)
Subject: gnulib-tool: Transform license on build-aux/ files too.
X-Git-Tag: v0.1~5894
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=2b08e890726e2c572d2ba64f19bece957d1bfd98;p=gnulib.git

gnulib-tool: Transform license on build-aux/ files too.
---

diff --git a/ChangeLog b/ChangeLog
index 8b49c1128..d71b5cb5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-28  Simon Josefsson  <simon@josefsson.org>
+
+	* gnulib-tool: Transform license on build-aux/ files too.
+
 2009-05-27  Simon Josefsson  <simon@josefsson.org>
 
 	* gnulib-tool (sed_transform_main_lib_file)
diff --git a/gnulib-tool b/gnulib-tool
index 36ee71400..c633da21e 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2874,6 +2874,17 @@ s,^\(.................................................[^ ]*\) *,
     fi
   fi
 
+  # Determine script to apply to auxilliary files that go into $auxdir/.
+  sed_transform_build_aux_file="$sed_transform_lib_file"
+  if test -n "$do_copyrights"; then
+    # Update license.
+    sed_transform_build_aux_file=$sed_transform_build_aux_file'
+      s/GNU Lesser General/GNU General/g
+      s/GNU Library General/GNU General/g
+      s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
+    '
+  fi
+
   # Determine script to apply to library files that go into $testsbase/.
   sed_transform_testsrelated_lib_file="$sed_transform_lib_file"
   if test -n "$do_copyrights"; then
@@ -3025,6 +3036,14 @@ s,^\(.................................................[^ ]*\) *,
           ;;
       esac
     fi
+    if test -n "$sed_transform_build_aux_file"; then
+      case "$of" in
+        build-aux/*)
+          sed -e "$sed_transform_build_aux_file" \
+            < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed"
+          ;;
+      esac
+    fi
     if test -n "$sed_transform_testsrelated_lib_file"; then
       case "$of" in
         tests=lib/*)