summaryrefslogtreecommitdiffstats
path: root/git-rpm.mk
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2009-02-02 13:07:52 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2009-02-02 13:07:52 +0100
commit0e2aeb90889e04e72ffe286ad88bc647100f1323 (patch)
tree8329b71e9930c55da667d611431df9989320172b /git-rpm.mk
parent93997a8497562d4cad00bed68108f67d68bb2588 (diff)
downloadgit-rpm-0e2aeb90889e04e72ffe286ad88bc647100f1323.tar.gz
git-rpm-0e2aeb90889e04e72ffe286ad88bc647100f1323.tar.xz
git-rpm-0e2aeb90889e04e72ffe286ad88bc647100f1323.zip
Use proper dir macro defs for rpm runs
Diffstat (limited to 'git-rpm.mk')
-rw-r--r--git-rpm.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/git-rpm.mk b/git-rpm.mk
index fb08ae3..7b1b23c 100644
--- a/git-rpm.mk
+++ b/git-rpm.mk
@@ -4,18 +4,19 @@ UPLOAD_FILES =
OPTS =
OPTS += --define "_sourcedir $${PWD}"
OPTS += --define "_builddir $${PWD}/rpm-build"
-OPTS += --define "_srcrpmdir $${PWD}/rpm-dist" --define "_rpmdir $${PWD}/rpm-dist"
+OPTS += --define "_srcrpmdir $${PWD}/rpm-dist"
+OPTS += --define "_rpmdir $${PWD}/rpm-dist"
NAME ?= packagename-to-be-defined
SPEC = $(NAME).spec
-RPM_SUMMARY = $(shell rpm -q --specfile $(SPEC) --queryformat '[%{SUMMARY}\n]' | sed '1q')
-RPM_URL = $(shell rpm -q --specfile $(SPEC) --queryformat '[%{URL}\n]' | sed '1q')
+RPM_SUMMARY = $(shell rpm $(OPTS) -q --specfile $(SPEC) --queryformat '[%{SUMMARY}\n]' | sed '1q')
+RPM_URL = $(shell rpm $(OPTS) -q --specfile $(SPEC) --queryformat '[%{URL}\n]' | sed '1q')
-RPM_VERSION := $(shell rpm -q --specfile $(SPEC) --queryformat '[%{VERSION}\n]' | sed '1q')
-RPM_RELEASE := $(shell rpm -q --specfile $(SPEC) --queryformat '[%{RELEASE}\n]' | sed '1q')
-RPM_ARCH := $(shell rpm -q --specfile $(SPEC) --queryformat '[%{ARCH}\n]' | sed '1q')
+RPM_VERSION := $(shell rpm $(OPTS) -q --specfile $(SPEC) --queryformat '[%{VERSION}\n]' | sed '1q')
+RPM_RELEASE := $(shell rpm $(OPTS) -q --specfile $(SPEC) --queryformat '[%{RELEASE}\n]' | sed '1q')
+RPM_ARCH := $(shell rpm $(OPTS) -q --specfile $(SPEC) --queryformat '[%{ARCH}\n]' | sed '1q')
NVR = $(NAME)-$(RPM_VERSION)-$(RPM_RELEASE)