From a162fa70da4fa1b0292cfffbc82b75bd5d5d0d80 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Mon, 12 Nov 2012 14:21:08 +0100 Subject: [PATCH] moduleformatter.py should include our own ansible clone Without this, module_formatter.py relies on the installed ansible which is wrong in more than one way. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fd4b5f6adc8..75a418d8b83 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; pri # VERSION file provides one place to update the software version VERSION := $(shell cat VERSION) -### Get the branch information from git +# Get the branch information from git ifneq ($(shell which git),) GIT_DATE := $(shell git log -n 1 --format="%ai") endif @@ -164,16 +164,16 @@ deb: debian # for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory modulepages: - hacking/module_formatter.py -A $(VERSION) -t man -o docs/man/man3/ --module-dir=library --template-dir=hacking/templates + PYTHONPATH=./lib hacking/module_formatter.py -A $(VERSION) -t man -o docs/man/man3/ --module-dir=library --template-dir=hacking/templates modulejson: mkdir -p docs/json - hacking/module_formatter.py -A $(VERSION) -t json -o docs/json --module-dir=library --template-dir=hacking/templates + PYTHONPATH=./lib hacking/module_formatter.py -A $(VERSION) -t json -o docs/json --module-dir=library --template-dir=hacking/templates modulejs: mkdir -p docs/js make modulejson - hacking/module_formatter.py -A $(VERSION) -t js -o docs/js --module-dir=docs/json --template-dir=hacking/templates + PYTHONPATH=./lib hacking/module_formatter.py -A $(VERSION) -t js -o docs/js --module-dir=docs/json --template-dir=hacking/templates # because this requires Sphinx it is not run as part of every build, those building the RPM and so on can ignore this