shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-27 09:25:10 +03:00
Code Releases Activity

Allow specifying RPM_DIST when running Makefile

Browse Source 
Fixes an issue where the system running make isn't the desired %{dist}
target (e.g. building el7 packages on an el6 system).
This commit is contained in:
James Laska 2014-10-21 15:50:24 -04:00
parent 012a83d37f
commit d7792413a0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -55,7 +55,7 @@ DEB_PPA ?= reprepro
# RPM build parameters
RPM_SPECDIR= packaging/rpm
RPM_SPEC = $(RPM_SPECDIR)/$(NAME).spec
RPM_DIST = $(shell rpm --eval '%{?dist}' 2>/dev/null)
RPM_DIST ?= $(shell rpm --eval '%{?dist}' 2>/dev/null)
ifeq ($(OFFICIAL),yes)
RPM_RELEASE = $(RELEASE)
else