summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2023-01-14 14:05:18 -0500
committerPaul Smith <psmith@gnu.org>2023-01-14 17:07:04 -0500
commitdb351fe85b57fe4368a1396fb0e8ea5814825e68 (patch)
treebbf2a38a1302c98c28024d61c4d79782d4ff7ba8
parent8a0d7fd4efec5147559a9c086289fb5b30956f6c (diff)
downloadmake-git-db351fe85b57fe4368a1396fb0e8ea5814825e68.tar.gz
Prerelease GNU Make 4.4.0.904.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.
-rw-r--r--NEWS5
-rw-r--r--README.git2
-rw-r--r--maintMakefile37
3 files changed, 8 insertions, 36 deletions
diff --git a/NEWS b/NEWS
index 592a3418..54f71e93 100644
--- 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.
+
-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 eaf7138a..638a34f1 100644
--- 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 46723a2f..2747aad6 100644
--- 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.