diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index d1e33a4..0f07509 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,9 @@ RELEASE_ARCHIVE_SUFFIX = libgpg-error # to specify the key for signing. For example: # RELEASE_SIGNKEY=D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 +# Macro to help the release target. +RELEASE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) + # Autoconf flags ACLOCAL_AMFLAGS = -I m4 @@ -116,9 +119,6 @@ stowinstall: $(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/libgpg-error -# Macro to help the release target. -RELEASE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) - release: +(set -e;\ if [ "$(abs_top_builddir)" = "$(abs_top_srcdir)" ]; then \ @@ -142,13 +142,15 @@ release: sign-release: +(set -e; \ test $$(pwd | sed 's,.*/,,') = dist || cd dist; \ - x=$$(grep '^RELEASE_ARCHIVE=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\ + x=$$(grep '^[[:blank:]]*RELEASE_ARCHIVE[[:blank:]]*=' \ + $$HOME/.gnupg-autogen.rc|cut -d= -f2|xargs);\ if [ -z "$$x" ]; then \ echo "error: RELEASE_ARCHIVE missing in ~/.gnupg-autogen.rc">&2; \ exit 2;\ fi;\ myarchive="$$x/$(RELEASE_ARCHIVE_SUFFIX)";\ - x=$$(grep '^RELEASE_SIGNKEY=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\ + x=$$(grep '^[[:blank:]]*RELEASE_SIGNKEY[[:blank:]]*=' \ + $$HOME/.gnupg-autogen.rc|cut -d= -f2|xargs);\ if [ -z "$$x" ]; then \ echo "error: RELEASE_SIGNKEY missing in ~/.gnupg-autogen.rc">&2; \ exit 2;\ @@ -1,4 +1,4 @@ -Noteworthy changes in version 1.48 (unreleased) [C34/A34/R_] +Noteworthy changes in version 1.48 (2024-02-23) [C35/A35/R0] ----------------------------------------------- * New configure option --with-libtool-modification. [T6619] diff --git a/configure.ac b/configure.ac index f459f23..9223912 100644 --- a/configure.ac +++ b/configure.ac @@ -49,8 +49,8 @@ AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org]) # (Interfaces added: AGE++) # (Interfaces removed: AGE=0) # Note that added error codes don't constitute an interface change. -LIBGPG_ERROR_LT_CURRENT=34 -LIBGPG_ERROR_LT_AGE=34 +LIBGPG_ERROR_LT_CURRENT=35 +LIBGPG_ERROR_LT_AGE=35 LIBGPG_ERROR_LT_REVISION=0 ################################################ |