Because folks on RHEL 6 (not CentOS 6) have some issues with asciidoc, do not build the asciidoc from

the rpm or make install targets.  Also modify the make install (only) to copy over files into the library
directory since the setup.py does not do this (due to a distutils bug, more or less).
pull/70/head
Michael DeHaan 12 years ago
parent 1a0672fd1e
commit 9049b0e7ca

@ -14,9 +14,7 @@ all: clean python
tests: tests:
PYTHONPATH=./lib nosetests PYTHONPATH=./lib nosetests
docs: manuals docs: $(MANPAGES)
manuals: $(MANPAGES)
%.1: %.1.asciidoc %.1: %.1.asciidoc
$(ASCII2MAN) $(ASCII2MAN)
@ -52,10 +50,12 @@ clean:
@echo "Cleaning up RPM building stuff" @echo "Cleaning up RPM building stuff"
-rm -rf MANIFEST rpm-build -rm -rf MANIFEST rpm-build
python: docs python:
python setup.py build python setup.py build
install: docs install:
mkdir -p /usr/share/ansible
cp ./library/* /usr/share/ansible/
python setup.py install python setup.py install
sdist: clean sdist: clean

@ -1,2 +1 @@
*.xml *.xml
*.[0-9]

@ -1,5 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python
# NOTE: setup.py does NOT install the contents of the library dir
# for you, you should go through "make install" or "make RPMs"
# for that, or manually copy modules over.
import glob import glob
import os import os
import sys import sys

Loading…
Cancel
Save