From 67679cfb5b18b3b4c15aeec3df22d04a5eed908a Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 22 Jul 2017 22:40:23 -0400 Subject: Makefile.am: Override PACKAGE_STRING with git-describe output This makes the test suite output and log a little more informative. --- diff --git a/Makefile.am b/Makefile.am index 744f436..b9429ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,16 @@ else PACKAGE_VERSION_GIT = $(PACKAGE_VERSION) endif +# PACKAGE_STRING is used in the test suite output and log. +# PACKAGE_VERSION can't be overridden. Automake ignores it in the IN_GIT +# conditional (and throws a warning), and setting it to $(PACKAGE_VERSION_GIT) +# outside the conditional causes PACKAGE_VERSION_GIT to reference itself. +# VERSION is not set here because it is used by: +# * Automake's distdir macro +# * Automake's distdir target (which checks for $(VERSION) in NEWS) +# * Our release target +PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION_GIT) + MANUAL = ProteanOS Archive Manager Manual TEXTDOMAIN = $$(printf '%s\n' '$(PACKAGE)' | sed -e 's|-|_|g') -- cgit v0.9.1