diff --git a/Makefile b/Makefile index b5915ebc5c1..188d6e54157 100644 --- a/Makefile +++ b/Makefile @@ -14,9 +14,7 @@ all: clean python tests: PYTHONPATH=./lib nosetests -docs: manuals - -manuals: $(MANPAGES) +docs: $(MANPAGES) %.1: %.1.asciidoc $(ASCII2MAN) @@ -52,10 +50,12 @@ clean: @echo "Cleaning up RPM building stuff" -rm -rf MANIFEST rpm-build -python: docs +python: python setup.py build -install: docs +install: + mkdir -p /usr/share/ansible + cp ./library/* /usr/share/ansible/ python setup.py install sdist: clean diff --git a/docs/man/.gitignore b/docs/man/.gitignore index 7c0aaeb5e42..6722cd96e78 100644 --- a/docs/man/.gitignore +++ b/docs/man/.gitignore @@ -1,2 +1 @@ *.xml -*.[0-9] diff --git a/setup.py b/setup.py index 525c1210889..4b0f74b3bf3 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,9 @@ #!/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 os import sys