From ec6198012261e11b72bd5a95bd9e5c4d895c5f22 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Sat, 21 May 2016 15:23:54 -0400
Subject: [PATCH] GNU Make release 4.2.

---
 .gitignore    | 8 ++++----
 Makefile.am   | 2 +-
 NEWS          | 4 ++--
 README.git    | 3 ++-
 configure.ac  | 2 +-
 doc/make.texi | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3990c553..07649663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,10 +35,10 @@ make
 *.sbr
 
 # Windows build artifacts
-/WinDebug/
-/WinRel/
-/GccDebug/
-/GccRel/
+WinDebug/
+WinRel/
+GccDebug/
+GccRel/
 
 # Distribution artifacts
 .dep_segment
diff --git a/Makefile.am b/Makefile.am
index edd6077d..c88c465e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@ endif
 
 # Extra stuff to include in the distribution.
 
-EXTRA_DIST =	README build.sh.in $(man_MANS) \
+EXTRA_DIST =	ChangeLog README build.sh.in $(man_MANS) \
 		README.customs README.OS2 \
 		SCOPTIONS SMakefile \
 		README.Amiga Makefile.ami config.ami make.lnk amiga.c amiga.h \
diff --git a/NEWS b/NEWS
index 08dbb19f..27f6f068 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU make NEWS                                               -*-indented-text-*-
   History of user-visible changes.
-  11 Apr 2016
+  22 May 2016
 
 See the end of this file for copyrights and conditions.
 
@@ -9,7 +9,7 @@ manual, which is contained in this distribution as the file doc/make.texi.
 See the README file and the GNU make manual for instructions for
 reporting bugs.
 
-Version 4.1.90 (11 Apr 2016)
+Version 4.2 (22 May 2016)
 
 A complete list of bugs fixed in this version is available here:
 
diff --git a/README.git b/README.git
index 41820136..41a7675d 100644
--- a/README.git
+++ b/README.git
@@ -243,7 +243,8 @@ work on it:
 Where to Announce
 -----------------
 
-Create the announcement in a text file, then sign it with GPG.
+Create the announcement in a text file, using 'git shortlog',
+then sign it with GPG:
 
   gpg --clearsign <announcement.txt>
 
diff --git a/configure.ac b/configure.ac
index 42ec4489..1902823d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([GNU make],[4.1.90],[bug-make@gnu.org])
+AC_INIT([GNU make],[4.2],[bug-make@gnu.org])
 
 AC_PREREQ([2.69])
 
diff --git a/doc/make.texi b/doc/make.texi
index 2dc907a3..01bcec72 100644
--- a/doc/make.texi
+++ b/doc/make.texi
@@ -3,7 +3,7 @@
 @setfilename make.info
 
 @include version.texi
-@set EDITION 0.73
+@set EDITION 0.74
 
 @settitle GNU @code{make}
 @setchapternewpage odd