aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-02-26 22:27:38 +0000
committerDavid Howells <dhowells@redhat.com>2015-02-26 22:27:52 +0000
commit1975ec7512e9624ec7230024351a1fa81bea5ebb (patch)
tree6fb20c3eb06118c3ececeb8ef4d624221bfc4f78
parent7e22a95f98aa9290b944e3590a3f1897aa7f75ac (diff)
downloadcachefilesd-1975ec7512e9624ec7230024351a1fa81bea5ebb.tar.gz
The rpmbuild %dist macro moved so look for it more broadly
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@redhat.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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))