archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2278 from jcftang/devel

Browse Source 
Teach makefile to accept different versions of python
pull/2283/merge
Michael DeHaan 12 years ago
parent c4aa72f1fd 785068df63
commit e5f5d354cf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File

9
Makefile
Unescape Escape View File

@ -28,7 +28,8 @@ else
ASCII2MAN = @echo "ERROR: AsciiDoc 'a2x' command is not installed but is required to build $(MANPAGES)" && exit 1 ASCII2MAN = @echo "ERROR: AsciiDoc 'a2x' command is not installed but is required to build $(MANPAGES)" && exit 1
endif endif
SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") PYTHON=python
SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
# VERSION file provides one place to update the software version # VERSION file provides one place to update the software version
VERSION := $(shell cat VERSION) VERSION := $(shell cat VERSION)
@ -118,13 +119,13 @@ clean:
rm -rf docs/js rm -rf docs/js
python: python:
python setup.py build $(PYTHON) setup.py build
install: install:
python setup.py install $(PYTHON) setup.py install
sdist: clean docs sdist: clean docs
python setup.py sdist -t MANIFEST.in $(PYTHON) setup.py sdist -t MANIFEST.in
rpmcommon: sdist rpmcommon: sdist
@mkdir -p rpm-build @mkdir -p rpm-build

Write Preview
Loading…
Cancel
Save