Skip to content

Commit

Permalink
Because folks on RHEL 6 (not CentOS 6) have some issues with asciidoc…
Browse files Browse the repository at this point in the history
…, 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
mpdehaan committed Mar 16, 2012
1 parent 1a0672f commit 9049b0e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ all: clean python
tests:
PYTHONPATH=./lib nosetests

docs: manuals

manuals: $(MANPAGES)
docs: $(MANPAGES)

%.1: %.1.asciidoc
$(ASCII2MAN)
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion docs/man/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
*.xml
*.[0-9]
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 9049b0e

Please sign in to comment.