Permalink
Browse files

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).
  • Loading branch information...
1 parent 1a0672f commit 9049b0e7ca58492a9eec76a88297a6aeb03d0bc0 @mpdehaan committed Mar 16, 2012
Showing with 9 additions and 6 deletions.
  1. +5 −5 Makefile
  2. +0 −1 docs/man/.gitignore
  3. +4 −0 setup.py
View
@@ -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
View
@@ -1,2 +1 @@
*.xml
-*.[0-9]
View
@@ -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

0 comments on commit 9049b0e

Please sign in to comment.