m4-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch-1_4 update


From: Eric Blake
Subject: branch-1_4 update
Date: Tue, 09 May 2006 05:50:16 -0600
User-agent: Thunderbird 1.5.0.2 (Windows/20060308)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm looking at putting a couple of submitted patches on branch-1_4.  In
preparation, I applied this patch to get rid of a warning when using
autoconf 2.59c to bootstrap, and bumped the copyright year in --version.
Both of these fixes happen automatically on CVS head (gnulib takes care of
the copyright year, and CVS automake takes care of defining datarootdir).

I also updated some .cvsignore files, to avoid checking in generated
files.  This included removing doc/stamp-vti, doc/version.texi, and
stamp-h.in.  For now, I left config-h.in and configure in CVS, but those
could probably be removed, too.  Also, checks/[0-9][0-9].* are generated
files, but checks/get-them claims to require GNU awk, so I don't know that
they can be portably regenerated when bootstrapping, so I left them in CVS.

config.status: creating Makefile
config.status: WARNING:  Makefile.in seems to ignore the --datarootdir setting
config.status: creating doc/Makefile
config.status: WARNING:  doc/Makefile.in seems to ignore the --datarootdir
setting

2006-05-09  Eric Blake  <address@hidden>

        * src/m4.c (main): Bump copyright year.
        * Makefile.in (datarootdir): Define, for autoconf 2.59c.
        * doc/Makefile.in (datarootdir): Likewise.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEYIH484KuGfSFAYARAihIAKDZkMsAi958Hjz0YuL++3Bd/XYpoACfZlCw
Nu0DMdF3Ga8F/VGYICyRcwc=
=0OSR
-----END PGP SIGNATURE-----
Index: Makefile.in
===================================================================
RCS file: /sources/m4/m4/Attic/Makefile.in,v
retrieving revision 1.1.1.1.2.6
diff -u -p -r1.1.1.1.2.6 Makefile.in
--- Makefile.in 1 May 2005 11:54:11 -0000       1.1.1.1.2.6
+++ Makefile.in 9 May 2006 11:46:27 -0000
@@ -1,6 +1,6 @@
 ## Makefile.in -- Main Makefile for GNU m4.
 ##
-## Copyright (C) 1992, 1993, 1994, 2005 Free Software Foundation, Inc.
+## Copyright (C) 1992, 1993, 1994, 2005, 2006 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
@@ -44,6 +44,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 infodir = @infodir@
+datarootdir = @datarootdir@
 
 MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
 prefix='$(prefix)' exec_prefix='$(exec_prefix)' \
Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ .cvsignore  9 May 2006 11:46:27 -0000
@@ -0,0 +1,6 @@
+autom4te.cache
+config.h
+config.log
+config.status
+Makefile
+stamp-h
Index: stamp-h.in
===================================================================
RCS file: stamp-h.in
diff -N stamp-h.in
--- stamp-h.in  20 Oct 2005 12:50:53 -0000      1.1.1.1.2.11
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Thu Oct 20 13:43:01 BST 2005
Index: doc/Makefile.in
===================================================================
RCS file: /sources/m4/m4/doc/Attic/Makefile.in,v
retrieving revision 1.1.1.1.2.5
diff -u -p -r1.1.1.1.2.5 Makefile.in
--- doc/Makefile.in     1 May 2005 11:54:12 -0000       1.1.1.1.2.5
+++ doc/Makefile.in     9 May 2006 11:46:27 -0000
@@ -1,6 +1,6 @@
 ## Makefile.in -- Makefile for GNU m4 documentation.
 ##
-## Copyright (C) 1994, 2005 Free Software Foundation, Inc.
+## Copyright (C) 1994, 2005, 2006 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
@@ -31,6 +31,7 @@ TEXI2DVI = texi2dvi
 
 prefix = @prefix@
 infodir = @infodir@
+datarootdir = @datarootdir@
 
 .SUFFIXES:
 
Index: doc/.cvsignore
===================================================================
RCS file: doc/.cvsignore
diff -N doc/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ doc/.cvsignore      9 May 2006 11:46:27 -0000
@@ -0,0 +1,2 @@
+m4.info
+Makefile
Index: doc/stamp-vti
===================================================================
RCS file: doc/stamp-vti
diff -N doc/stamp-vti
--- doc/stamp-vti       20 Oct 2005 12:50:54 -0000      1.1.1.1.2.11
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Thu Oct 20 13:43:03 BST 2005
Index: doc/version.texi
===================================================================
RCS file: doc/version.texi
diff -N doc/version.texi
--- doc/version.texi    20 Oct 2005 12:50:54 -0000      1.1.1.1.2.9
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
address@hidden EDITION 1.4.4a
address@hidden UPDATED October 2005
address@hidden VERSION 1.4.4a
Index: src/m4.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/m4.c,v
retrieving revision 1.1.1.1.2.7
diff -u -p -r1.1.1.1.2.7 m4.c
--- src/m4.c    18 Oct 2005 11:51:21 -0000      1.1.1.1.2.7
+++ src/m4.c    9 May 2006 11:46:27 -0000
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005 Free
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -394,7 +394,7 @@ main (int argc, char *const *argv, char 
       printf ("%s\n", PACKAGE_STRING);
       printf ("Written by Rene' Seindal.\n\
 \n\
-Copyright (C) 2005 Free Software Foundation, Inc.\n\
+Copyright (C) 2006 Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 ");
Index: src/.cvsignore
===================================================================
RCS file: src/.cvsignore
diff -N src/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ src/.cvsignore      9 May 2006 11:46:27 -0000
@@ -0,0 +1,2 @@
+*.o
+Makefile
Index: checks/.cvsignore
===================================================================
RCS file: checks/.cvsignore
diff -N checks/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ checks/.cvsignore   9 May 2006 11:46:27 -0000
@@ -0,0 +1 @@
+Makefile
Index: examples/.cvsignore
===================================================================
RCS file: examples/.cvsignore
diff -N examples/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ examples/.cvsignore 9 May 2006 11:46:27 -0000
@@ -0,0 +1 @@
+Makefile
Index: lib/.cvsignore
===================================================================
RCS file: lib/.cvsignore
diff -N lib/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lib/.cvsignore      9 May 2006 11:46:27 -0000
@@ -0,0 +1 @@
+Makefile

reply via email to

[Prev in Thread] Current Thread [Next in Thread]