* Makefile.maint: Sync with CVS Autoconf.

diff --git a/ChangeLog b/ChangeLog
index d31a44eadbab48b085b5d6b7a89f34cb39bc9f44..203efb5011eb4c067c9b77a3a3475c6bc9ca1eb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2001-08-15  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.maint: Sync with CVS Autoconf.
+

 2001-08-14  Pascal Bart  <pascal.bart@epita.fr>
 
 2001-08-14  Pascal Bart  <pascal.bart@epita.fr>
 

-       * doc/bison.texinfo: Include GNU Free Documentation License from 
+       * doc/bison.texinfo: Include GNU Free Documentation License from

        `fdl.texi'.
        * doc/fdl.texi: Add to package.
 
        `fdl.texi'.
        * doc/fdl.texi: Add to package.
 


@@ -8,10 +12,10 @@
 
        Turn on %{source,header}_extension features.
 
 
        Turn on %{source,header}_extension features.
 

-       * src/lex.c (percent_table): Un-CPP out header_extension and 
+       * src/lex.c (percent_table): Un-CPP out header_extension and

        source_extension.
        * src/files.c (compute_exts_from_gf): Compare pointers with NULL.
        source_extension.
        * src/files.c (compute_exts_from_gf): Compare pointers with NULL.

-       (compute_exts_from_src): Remove conditions. It restores priorities 
+       (compute_exts_from_src): Remove conditions. It restores priorities

        between options.
 
 2001-08-14  Marc Autret  <autret_m@epita.fr>
        between options.
 
 2001-08-14  Marc Autret  <autret_m@epita.fr>


@@ -22,7 +26,7 @@
 
 2001-08-13  Marc Autret  <autret_m@epita.fr>
 
 
 2001-08-13  Marc Autret  <autret_m@epita.fr>
 

-       * src/bison.simple (YYSTACK_USE_ALLOCA): Changed to allow users 
+       * src/bison.simple (YYSTACK_USE_ALLOCA): Changed to allow users

        defining it (defined but null disables alloca).
 
 2001-08-13  Marc Autret  <autret_m@epita.fr>
        defining it (defined but null disables alloca).
 
 2001-08-13  Marc Autret  <autret_m@epita.fr>

diff --git a/Makefile.maint b/Makefile.maint
index 69fbbd24d64fd451abfe05fda257a93268bf2eb4..3f5a7ed74d584ad4f16b5ab1676f3139a1617f14 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -1,6 +1,23 @@
 # -*-Makefile-*-
 # This Makefile fragment is shared between fileutils, sh-utils, textutils,
 # -*-Makefile-*-
 # This Makefile fragment is shared between fileutils, sh-utils, textutils,

-# CPPI, Bison, and Autoconf.
+# and Autoconf.
+
+## Copyright 2001 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+## 02111-1307, USA.

 
 prev_version_file ?= .prev-version
 
 
 prev_version_file ?= .prev-version
 


@@ -77,13 +94,12 @@ cvs-tag-check:
        else :; fi
 
 cvs-diff-check:
        else :; fi
 
 cvs-diff-check:

-       cvs diff | grep -v '^?' >cvs-diffs;                     \
-       if grep . cvs-diff >/dev/null; then                     \
-         echo "Some files are locally modified:" >&2;          \
-         cat cvs-diffs >&2;                                    \
-         exit 1;                                               \
-       else                                                    \
+       if cvs diff >cvs-diffs; then                            \

          rm cvs-diffs;                                         \
          rm cvs-diffs;                                         \

+       else                                                    \
+         echo "Some files are locally modified:" 1>&2;         \
+         cat cvs-diffs;                                        \
+         exit 1;                                               \

        fi
 
 cvs-check: cvs-diff-check cvs-tag-check
        fi
 
 cvs-check: cvs-diff-check cvs-tag-check