From 9049b0e7ca58492a9eec76a88297a6aeb03d0bc0 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Thu, 15 Mar 2012 20:21:10 -0400
Subject: [PATCH] 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).

---
 Makefile            | 10 +++++-----
 docs/man/.gitignore |  1 -
 setup.py            |  4 ++++
 3 files changed, 9 insertions(+), 6 deletions(-)

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