Skip to content

Commit 9049b0e

Browse files
committed
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).
1 parent 1a0672f commit 9049b0e

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ all: clean python
1414
tests:
1515
PYTHONPATH=./lib nosetests
1616

17-
docs: manuals
18-
19-
manuals: $(MANPAGES)
17+
docs: $(MANPAGES)
2018

2119
%.1: %.1.asciidoc
2220
$(ASCII2MAN)
@@ -52,10 +50,12 @@ clean:
5250
@echo "Cleaning up RPM building stuff"
5351
-rm -rf MANIFEST rpm-build
5452

55-
python: docs
53+
python:
5654
python setup.py build
5755

58-
install: docs
56+
install:
57+
mkdir -p /usr/share/ansible
58+
cp ./library/* /usr/share/ansible/
5959
python setup.py install
6060

6161
sdist: clean

docs/man/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
*.xml
2-
*.[0-9]

setup.py

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/usr/bin/env python
22

3+
# NOTE: setup.py does NOT install the contents of the library dir
4+
# for you, you should go through "make install" or "make RPMs"
5+
# for that, or manually copy modules over.
6+
37
import glob
48
import os
59
import sys

0 commit comments

Comments
 (0)