From 8718a929aec6a815f0d61a4387ae74d9c2bfe88b Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Tue, 11 Oct 2022 16:41:23 +0200
Subject: [PATCH] PR29668 - make rpm target

Without this fix, `make rpm` complains about 'GIT_PRETTY_REV'
not being declared in this scope at the build time.
---
 Makefile.am | 2 +-
 version.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1f100cea5..ff59b95bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -435,7 +435,7 @@ install-uprobes:
 .PHONY: $(PHONIES)
 
 dist-gzip:
-	cd $(srcdir); git status | grep working.directory.clean || (echo "You should commit your changes before 'make rpm'.")
+	cd $(srcdir); git status | egrep 'working.(tree|directory).clean' || (echo "You should commit your changes before 'make rpm'.")
 	(cd $(srcdir); git archive --prefix=systemtap-$(VERSION)/ --format=tar HEAD) | gzip > systemtap-$(VERSION).tar.gz
 
 rpm: dist-gzip
diff --git a/version.h b/version.h
index b8c1394fe..45af2c7f8 100644
--- a/version.h
+++ b/version.h
@@ -10,7 +10,7 @@
   (STAP_EXTRA_VERSION[0] ? GIT_MESSAGE ", " STAP_EXTRA_VERSION : GIT_PRETTY_REV)
 #else
 #define STAP_EXTENDED_VERSION \
-  (STAP_EXTRA_VERSION[0] ? STAP_EXTRA_VERSION : GIT_PRETTY_REV)
+  (STAP_EXTRA_VERSION[0] ? STAP_EXTRA_VERSION : GIT_MESSAGE)
 #endif
 
 #endif /* VERSION_H */
-- 
2.43.5