diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2009-03-05 04:12:40 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2009-03-05 04:13:37 +0100 |
| commit | 223e07296b3ffd502bbe5913217d518f0f0bfca3 (patch) | |
| tree | bbc078dccbe5a3d10d0af68646210bcc5062c943 /git-rpm.mk | |
| parent | 246b03dc02e7c0ade3bcb196b6ed3a17b3e88508 (diff) | |
| download | git-rpm-223e07296b3ffd502bbe5913217d518f0f0bfca3.tar.gz git-rpm-223e07296b3ffd502bbe5913217d518f0f0bfca3.tar.xz git-rpm-223e07296b3ffd502bbe5913217d518f0f0bfca3.zip | |
Rename OPTS var to RPM_OPTS
Diffstat (limited to 'git-rpm.mk')
| -rw-r--r-- | git-rpm.mk | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -1,23 +1,23 @@ RPMDIRS = rpm-build rpm-dist UPLOAD_FILES = -OPTS = -OPTS += --define "_sourcedir $${PWD}" -OPTS += --define "_builddir $${PWD}/rpm-build" -OPTS += --define "_srcrpmdir $${PWD}/rpm-dist" -OPTS += --define "_rpmdir $${PWD}/rpm-dist" -OPTS += --define "_specdir $${PWD}" +RPM_OPTS = +RPM_OPTS += --define "_sourcedir $${PWD}" +RPM_OPTS += --define "_builddir $${PWD}/rpm-build" +RPM_OPTS += --define "_srcrpmdir $${PWD}/rpm-dist" +RPM_OPTS += --define "_rpmdir $${PWD}/rpm-dist" +RPM_OPTS += --define "_specdir $${PWD}" NAME ?= packagename-to-be-defined SPEC = $(NAME).spec -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_SUMMARY = $(shell rpm $(RPM_OPTS) -q --specfile $(SPEC) --queryformat '[%{SUMMARY}\n]' | sed '1q') +RPM_URL = $(shell rpm $(RPM_OPTS) -q --specfile $(SPEC) --queryformat '[%{URL}\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') +RPM_VERSION := $(shell rpm $(RPM_OPTS) -q --specfile $(SPEC) --queryformat '[%{VERSION}\n]' | sed '1q') +RPM_RELEASE := $(shell rpm $(RPM_OPTS) -q --specfile $(SPEC) --queryformat '[%{RELEASE}\n]' | sed '1q') +RPM_ARCH := $(shell rpm $(RPM_OPTS) -q --specfile $(SPEC) --queryformat '[%{ARCH}\n]' | sed '1q') NVR = $(NAME)-$(RPM_VERSION)-$(RPM_RELEASE) @@ -54,7 +54,7 @@ clog: $(SPEC) UPLOAD_FILES += $(NVR)/$(NVR).src.rpm $(SRPM): $(SPEC) $(SOURCE_FILES) mkdir -p $(RPMDIRS) - rpmbuild $(OPTS) $(RPMBUILD_OPTS) -bs $(SPEC) + rpmbuild $(RPM_OPTS) $(RPMBUILD_OPTS) -bs $(SPEC) $(NVR)/$(NVR).src.rpm: $(SRPM) mkdir -p $(NVR) cp -p $< $@ @@ -65,7 +65,7 @@ rpm: $(BRPM) UPLOAD_FILES += $(NVR)/build.log $(BRPM) rpm-build/$(NVR).buildlog: $(SPEC) $(SOURCE_FILES) mkdir -p $(RPMDIRS) - rpmbuild $(OPTS) $(RPMBUILD_OPTS) -ba $(SPEC) 2>&1 | tee rpm-build/$(NVR).buildlog + rpmbuild $(RPM_OPTS) $(RPMBUILD_OPTS) -ba $(SPEC) 2>&1 | tee rpm-build/$(NVR).buildlog $(NVR)/build.log: rpm-build/$(NVR).buildlog mkdir -p $(NVR) |