diff --git a/gnulib-tool b/gnulib-tool index 669931c..791bba5 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -4526,6 +4526,17 @@ s,^\(.................................................[^ ]*\) *, done sed_transform_main_lib_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/Lesser General Public License/General Public License/g + + s/GNU Library General/GNU General/g + s/Library General Public License/General Public License/g + + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g + ' + if test -n "$lgpl"; then # Update license. case "$lgpl" in @@ -4535,6 +4546,7 @@ s,^\(.................................................[^ ]*\) *, s/General Public License/Lesser General Public License/g s/Lesser Lesser General Public License/Lesser General Public License/g ' + sed_transform_build_aux_file=$sed_transform_main_lib_file ;; 2) sed_transform_main_lib_file=$sed_transform_main_lib_file' @@ -4544,6 +4556,7 @@ s,^\(.................................................[^ ]*\) *, s/version [23]\([ ,]\)/version 2.1\1/g ' + sed_transform_build_aux_file=$sed_transform_main_lib_file ;; *) func_fatal_error "invalid value lgpl=$lgpl" ;; esac @@ -4562,19 +4575,6 @@ s,^\(.................................................[^ ]*\) *, fi # Determine script to apply to auxiliary files that go into $auxdir/. - sed_transform_build_aux_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/Lesser General Public License/General Public License/g - - s/GNU Library General/GNU General/g - s/Library General Public License/General Public License/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"