Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: fix "make centos{5,6,7}"
authormuxator <a.mux@inwind.it>
Thu, 11 Oct 2018 19:02:42 +0200
changeset 40149 9b0cdfb3c11e
parent 40148 74558635dad5
child 40150 1be1689d9ce9
packaging: fix "make centos{5,6,7}" Without this change, make centos{5,6,7} fails with error: cp: cannot stat '<basedir>/rpmbuild/RPMS/*/*': No such file or directory This change is the exact equivalent of bc4bbc42899a (which applied to Fedora).
contrib/packaging/Makefile file | annotate | diff | comparison | revisions 
--- a/contrib/packaging/Makefile	Wed Oct 10 19:46:13 2018 +0300
+++ b/contrib/packaging/Makefile	Thu Oct 11 19:02:42 2018 +0200
@@ -120,8 +120,8 @@
 centos$(1):
 	mkdir -p $$(HGROOT)/packages/centos$(1)
 	./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython)
-	cp $$(HGROOT)/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1)
-	cp $$(HGROOT)/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1)
+	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):
Mercurial