diff options
| author | Robin Jarry <robin@jarry.cc> | 2023-10-09 09:22:29 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2023-10-11 10:25:41 +0200 |
| commit | d179485eefe50da9d21abdd392cffd865e369509 (patch) | |
| tree | 08ec08cc6242f9348a8f254d61d6edd2932cd455 | |
| parent | c8469d30947a461f536be8f70e0f2ce9f44481a3 (diff) | |
| download | aerc-d179485eefe50da9d21abdd392cffd865e369509.tar.gz | |
release.sh: update version in GNUMakefile
The version is no longer present in Makefile which has been preserved
for explicit error reporting with non-GNU make versions.
Update the version in GNUMakefile instead.
Fixes: d725defa07b5 ("mk: deprecate BSD make in favor of GNU make")
Reported-by: Anton Mosich <anton@mosich.at>
Signed-off-by: Robin Jarry <robin@jarry.cc>
Acked-by: Moritz Poldrack <moritz@poldrack.dev>
| -rw-r--r-- | .editorconfig | 2 | ||||
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rwxr-xr-x | contrib/release.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.editorconfig b/.editorconfig index 6a5a6ddf..7c5d55d3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ indent_style = tab max_line_length = 80 tab_width = 8 -[Makefile] +[*Makefile] indent_style = tab [**.scd] diff --git a/GNUmakefile b/GNUmakefile index e9ad9073..53b55f8c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,6 @@ # variables that can be changed by users # -VERSION ?= $(shell git describe --long --abbrev=12 --tags --dirty 2>/dev/null || echo 0.15.2) +VERSION ?= $(shell git describe --long --abbrev=12 --tags --dirty 2>/dev/null || echo 0.16.0) PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin SHAREDIR ?= $(PREFIX)/share/aerc diff --git a/contrib/release.sh b/contrib/release.sh index 464eaadd..6ba01e14 100755 --- a/contrib/release.sh +++ b/contrib/release.sh @@ -12,9 +12,9 @@ fi tag_url="https://git.sr.ht/~rjarry/aerc/refs/$next_tag" echo "======= Creating release commit..." -sed -i Makefile -e "s/$prev_tag/$next_tag/g" +sed -i GNUMakefile -e "s/$prev_tag/$next_tag/g" sed -i CHANGELOG.md -e "s|^## \[Unreleased\].*|&\n\n## [$next_tag]($tag_url) - $(date +%Y-%m-%d)|" -git add Makefile CHANGELOG.md +git add GNUMakefile CHANGELOG.md git commit -sm "Release version $next_tag" echo "======= Creating tag..." |