GNU Make release 4.2.

diff --git a/.gitignore b/.gitignore
index 3990c5532fc281a95623e5ef0d02280314ecaa6a..0764966378e43a4e308e5050304e75c893b8043f 100644 (file)
--- 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 edd6077d0ffc2d8fce53b6bdb5e2c1f90938bb8f..c88c465e35739655045fb4db77549933e53111d1 100644 (file)
--- 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 08dbb19fba5f8e5f97094cc08121445e1907fc6e..27f6f068d083ad7fcd8cfd5c1a8f7ce1b613ab5d 100644 (file)
--- 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.
 \f
-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 41820136b08ddf42a88891d891e2231fabb126ed..41a7675d744756a5ad0c74cd376e89c87ebe5611 100644 (file)
--- 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 42ec448979dbb3a72523cf4e3a071c6e3c265a47..1902823d0d6e3bc1e63fc008fd79b23be0fbe2bf 100644 (file)
--- 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 2dc907a3aae60694850b78b2f3e9213c3ea6975e..01bcec72cc879c1fcad8bd5b3cc105e18874aa1d 100644 (file)
--- 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