Re: FYI: 313-gary-adjust-regexp-for-copyright

[Ralf Wildenhues]

* Gary V. Vaughan wrote on Mon, Feb 26, 2007 at 12:09:46PM CET:
> >On 26 Feb 2007, at 00:42, Ralf Wildenhues wrote:
> >>Why not let the match just look for the "DO NOT REMOVE THIS"
> >>line, just as is done some lines below?

> The address range in question needs to select just the first comment
> block, so we need to use the last line of that block for it to work
> as intended.

Sorry, I don't understand.  IMHO the patch below produces a more
readable Makefile.am file and is more maintainable wrt. the next FSF
copyright text change.  Would you disagree?  If no, OK to apply?

Cheers,
Ralf

2007-02-26  Ralf Wildenhues  <address@hidden>

        * libltdl/Makefile.inc: Fix the file description, so that it
        matches recursive and nonrecursive libltdl setup.
        * Makefile.am ($(srcdir)/libltdl/Makefile.am): Do not depend
        upon the exact text of the copyright header, just copy until
        the marker line.  Remove the marker lines in the output, and
        adjust the description for subpackage setup.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.212
diff -u -r1.212 Makefile.am
--- Makefile.am 26 Feb 2007 11:02:43 -0000      1.212
+++ Makefile.am 26 Feb 2007 18:38:58 -0000
@@ -201,7 +201,7 @@
        cd $(srcdir); \
        in=libltdl/Makefile.inc; out=libltdl/Makefile.am; \
        rm -f $$out; \
-       $(SED) -n '/^.. Makefile.am -- /,/^.. MA 02110-1301, USA./p' $$in > 
$$out; \
+       ( $(SED) -n '1,/^.. DO NOT REMOVE THIS LINE -- /p' $$in; \
        { echo 'ACLOCAL_AMFLAGS = -I m4'; \
          echo 'AUTOMAKE_OPTIONS = foreign'; \
          echo 'AM_CPPFLAGS ='; \
@@ -214,10 +214,13 @@
          echo 'EXTRA_DIST ='; \
          echo 'CLEANFILES ='; \
          echo 'MOSTLYCLEANFILES ='; \
-       } >> $$out; \
+       }; \
        $(SED) -n '/^.. DO NOT REMOVE THIS LINE -- /,$$p' $$in | \
        $(SED) -e 's,libltdl_,,; s,libltdl/,,; s,: libltdl/,: ,' \
-              -e 's,\$$(libltdl_,$$(,' >> $$out;
+              -e 's,\$$(libltdl_,$$(,' \
+       ) | \
+       $(SED) -e '/^.. DO NOT REMOVE THIS LINE -- /d' \
+              -e '1s,^\(.. Makefile.\)inc.*,\1am -- Process this file with 
automake to produce Makefile.in,' > $$out;
        chmod a-w $(srcdir)/libltdl/Makefile.am
 
 
Index: libltdl/Makefile.inc
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.inc,v
retrieving revision 1.6
diff -u -r1.6 Makefile.inc
--- libltdl/Makefile.inc        26 Feb 2007 07:44:23 -0000      1.6
+++ libltdl/Makefile.inc        26 Feb 2007 18:38:58 -0000
@@ -1,6 +1,6 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
+## Makefile.inc -- includable Makefile.am snippet
 ##
-## Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+## Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by