[Linux-cachefs] [PATCH 01/11] The rpmbuild %dist macro moved so look for it more broadly

[David Howells]

The rpmbuild %dist macro moved from /etc/rpm/macros.dist so look for it more
broadly (it's now in /usr/lib/rpm/macros.d/macros.dist).

Signed-off-by: David Howells <dhowells at redhat.com>
---

 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5e9c5ae..aaaf422 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ tarball: $(TARBALL)
 SRCBALL	:= rpmbuild/SOURCES/$(TARBALL)
 
 BUILDID	:= .local
-dist	:= $(word 2,$(shell grep "%dist" /etc/rpm/macros.dist))
+dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
 release	:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
 release	:= $(subst %{?dist},$(dist),$(release))
 release	:= $(subst %{?buildid},$(BUILDID),$(release))