summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <akim@epita.fr>2001-08-15 07:56:58 +0000
committerAkim Demaille <akim@epita.fr>2001-08-15 07:56:58 +0000
commit69b5cec495c549a41d4308bb2f4863e955de0019 (patch)
tree573ac405438eb3e2dc11abb748013477750422d1
parentf2b5126e4745085fc421b10849d2af1b3656e7d8 (diff)
downloadbison-69b5cec495c549a41d4308bb2f4863e955de0019.tar.gz
* Makefile.maint: Sync with CVS Autoconf.
-rw-r--r--ChangeLog12
-rw-r--r--Makefile.maint30
2 files changed, 31 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index d31a44ea..203efb50 100644
--- 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>
- * 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.
@@ -8,10 +12,10 @@
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.
- (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>
@@ -22,7 +26,7 @@
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>
diff --git a/Makefile.maint b/Makefile.maint
index 69fbbd24..3f5a7ed7 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -1,6 +1,23 @@
# -*-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
@@ -77,13 +94,12 @@ cvs-tag-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; \
+ else \
+ echo "Some files are locally modified:" 1>&2; \
+ cat cvs-diffs; \
+ exit 1; \
fi
cvs-check: cvs-diff-check cvs-tag-check