summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2016-06-15 17:01:55 -0400
committerAdrian Likins <alikins@redhat.com>2016-06-28 11:01:42 -0400
commita1c21f84001d0fcf1c41c78a11bdfe4693dc113e (patch)
treed9524f4829ce885028acc2d639edd308e3bf11be
parent3afe50dfe2d58586b119e2bd390c0c422a1bcda0 (diff)
downloadansible-a1c21f84001d0fcf1c41c78a11bdfe4693dc113e.tar.gz
Fewer deps for 'make webdocs' from top level
Previously it also built the MANPAGES target requiring asciidoc and libxml, before starting a 'make docs' in docsite. Also change the #! line in hacking/dump_playbook_attributes.py to not specify python2... yet.
-rw-r--r--Makefile2
-rwxr-xr-xhacking/dump_playbook_attributes.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 367987affc..e217d9ef6d 100644
--- a/Makefile
+++ b/Makefile
@@ -261,7 +261,7 @@ deb-src-upload: deb-src
# for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory
-webdocs: $(MANPAGES)
+webdocs:
(cd docsite/; make docs)
docs: $(MANPAGES)
diff --git a/hacking/dump_playbook_attributes.py b/hacking/dump_playbook_attributes.py
index 88029cd24d..357fbfaec2 100755
--- a/hacking/dump_playbook_attributes.py
+++ b/hacking/dump_playbook_attributes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
import optparse
from jinja2 import Environment, FileSystemLoader