comparison Makefile @ 23918:db8e3f7948b1 stable 3.3-rc

merge default into stable for 3.3 feature freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 17 Jan 2015 18:28:30 -0800
parents 272b1cc3e83e
children f86060e2b5e1
comparison
equal deleted inserted replaced
23826:c90d195320c5 23918:db8e3f7948b1
153 153
154 docker-fedora20: 154 docker-fedora20:
155 mkdir -p packages/fedora20 155 mkdir -p packages/fedora20
156 contrib/dockerrpm fedora20 156 contrib/dockerrpm fedora20
157 157
158 fedora21:
159 mkdir -p packages/fedora21
160 contrib/buildrpm
161 cp rpmbuild/RPMS/*/* packages/fedora21
162 cp rpmbuild/SRPMS/* packages/fedora21
163 rm -rf rpmbuild
164
165 docker-fedora21:
166 mkdir -p packages/fedora21
167 contrib/dockerrpm fedora21
168
158 centos5: 169 centos5:
159 mkdir -p packages/centos5 170 mkdir -p packages/centos5
160 contrib/buildrpm --withpython 171 contrib/buildrpm --withpython
161 cp rpmbuild/RPMS/*/* packages/centos5 172 cp rpmbuild/RPMS/*/* packages/centos5
162 cp rpmbuild/SRPMS/* packages/centos5 173 cp rpmbuild/SRPMS/* packages/centos5
186 contrib/dockerrpm centos7 197 contrib/dockerrpm centos7
187 198
188 .PHONY: help all local build doc clean install install-bin install-doc \ 199 .PHONY: help all local build doc clean install install-bin install-doc \
189 install-home install-home-bin install-home-doc \ 200 install-home install-home-bin install-home-doc \
190 dist dist-notests check tests check-code update-pot \ 201 dist dist-notests check tests check-code update-pot \
191 osx fedora20 docker-fedora20 \ 202 osx fedora20 docker-fedora20 fedora21 docker-fedora21 \
192 centos5 docker-centos5 centos6 docker-centos6 centos7 docker-centos7 203 centos5 docker-centos5 centos6 docker-centos6 centos7 docker-centos7