diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile index 90fba2248693748164365392ddfcf164892f5bb0_Y29udHJpYi9wYWNrYWdpbmcvTWFrZWZpbGU=..a69772d2f3c3a6a14aa6d664ea20217f48392dd4_Y29udHJpYi9wYWNrYWdpbmcvTWFrZWZpbGU= 100644 --- a/contrib/packaging/Makefile +++ b/contrib/packaging/Makefile @@ -20,6 +20,7 @@ # Build a Python for these CentOS releases. CENTOS_WITH_PYTHON_RELEASES := 5 6 +CENTOS_WITH_NONVERSIONED_PYTHON := 5 6 7 help: @echo 'Packaging Make Targets' @@ -110,9 +111,9 @@ .PHONY: centos$(1) centos$(1): mkdir -p $$(HGROOT)/packages/centos$(1) - ./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,--python python) + ./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(CENTOS_WITH_NONVERSIONED_PYTHON)),--python python,)) cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1) cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1) .PHONY: docker-centos$(1) docker-centos$(1): @@ -114,9 +115,9 @@ cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1) cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1) .PHONY: docker-centos$(1) docker-centos$(1): - ./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,--python python) + ./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(CENTOS_WITH_NONVERSIONED_PYTHON)),--python python,)) endef