Skip to content

Commit

Permalink
Merge pull request ansible#2278 from jcftang/devel
Browse files Browse the repository at this point in the history
Teach makefile to accept different versions of python
  • Loading branch information
mpdehaan committed Mar 10, 2013
2 parents c4aa72f + 785068d commit e5f5d35
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ else
ASCII2MAN = @echo "ERROR: AsciiDoc 'a2x' command is not installed but is required to build $(MANPAGES)" && exit 1
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 := $(shell cat VERSION)
Expand Down Expand Up @@ -118,13 +119,13 @@ clean:
rm -rf docs/js

python:
python setup.py build
$(PYTHON) setup.py build

install:
python setup.py install
$(PYTHON) setup.py install

sdist: clean docs
python setup.py sdist -t MANIFEST.in
$(PYTHON) setup.py sdist -t MANIFEST.in

rpmcommon: sdist
@mkdir -p rpm-build
Expand Down

0 comments on commit e5f5d35

Please sign in to comment.