Prerelease GNU Make 4.4.0.90

* NEWS: Update the date.
* README.git: Fix a typo.
* maintMakefile (check-alt-config): Report success.
(upload-*): Use the gnulib gnupload script for uploads.

diff --git a/NEWS b/NEWS
index 592a3418ede95676e764f7967b4c6a615330ae01..54f71e93460ead3ba1c9e6525d590e3143f45302 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU Make NEWS                                               -*-indented-text-*-
   History of user-visible changes.
-  01 January 2023
+  14 January 2023
 
 See the end of this file for copyrights and conditions.
 
@@ -8,8 +8,9 @@ All user-visible changes are more fully described in the GNU Make 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.4.1 (01 Jan 2023)
+Version 4.4.0.90 (14 Jan 2023)
 
 This release is primarily a bug-fix release.
 A complete list of bugs fixed in this version is available here:

diff --git a/README.git b/README.git
index eaf7138ac3302e71d94225f27e37b000ad61607d..638a34f19694a28d5b927786e5a68058de87905f 100644 (file)
--- a/README.git
+++ b/README.git
@@ -269,7 +269,7 @@ package from there:
 If you don't want to create a new repository then run "git clean -fdx".
 Then:
 
-  ./bootstrap.sh
+  ./bootstrap
   ./configure
   make distcheck
 

diff --git a/maintMakefile b/maintMakefile
index 46723a2ffe3583e8468f63cd479c31446b9db12a..2747aad6c70f94a588b2f3ad526822e7937575c0 100644 (file)
--- a/maintMakefile
+++ b/maintMakefile
@@ -300,6 +300,7 @@ CONFIG_CHECKS := \
 
 .PHONY: check-alt-config
 check-alt-config: $(CONFIG_CHECKS)
+       @echo --- $@ SUCCESS
 
 # Trick GNU Make so it doesn't run the submake as a recursive make.
 NR_MAKE = $(MAKE)
@@ -503,42 +504,12 @@ tag-release:
 # Sign it with my key.  If you don't have my key/passphrase then sorry,
 # you're SOL! :)
 
-GPG = gpg
-GPGFLAGS = -u $(GPG_KEYID)
-
-DIST_ARCHIVES_SIG = $(addsuffix .sig,$(DIST_ARCHIVES))
-DIST_ARCHIVES_DIRECTIVE = $(addsuffix .directive.asc,$(DIST_ARCHIVES))
-
-# A simple rule to test signing, etc.
-.PHONY: distsign
-distsign: $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE)
-
-%.sig : %
-       @echo "Signing file '$<':"
-       $(GPG) $(GPGFLAGS) -o "$@" -b "$<"
-
-%.directive.asc: %
-       @echo "Creating signed directive file '$@':"
-       @( \
-          echo 'version: 1.2'; \
-          echo 'directory: make'; \
-          echo 'filename: $*'; \
-          echo 'comment: Official upload of $(PACKAGE_NAME) version $(PACKAGE_VERSION)'; \
-        ) > "$*.directive"
-       $(GPG) $(GPGFLAGS) -o "$@" --clearsign "$*.directive"
-       @rm -f "$*.directive"
-
-# Upload the artifacts
-
-FTPPUT := $(firstword $(shell command -v ncftpput) $(wildcard $(GNULIBDIR)/build-aux/ncftpput-ftp) invalid)
-gnu-upload-host = ftp-upload.gnu.org
-gnu-upload-dir  = /incoming
-
+GNUPLOAD := $(GNULIBDIR)/build-aux/gnupload
 
 UPLOADS = upload-alpha upload-ftp
 .PHONY: $(UPLOADS)
-$(UPLOADS): $(DIST_ARCHIVES) $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE)
-       $(FTPPUT) "$(gnu-upload-host)" "$(gnu-upload-dir)/$(@:upload-%=%)" $^
+$(UPLOADS): upload-%: $(DIST_ARCHIVES)
+       $(GNUPLOAD) --user "$(GPG_KEYID)" --to "$*.gnu.org:make" -- $^
 
 
 # Rebuild Makefile.in if this file is modified.