diff options
| author | dequis <dx@dxzone.com.ar> | 2015-05-31 20:50:08 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2015-06-04 14:13:22 -0300 |
| commit | fd45e859aad9a4978afdff0478fc05d8290d75e7 (patch) | |
| tree | 9fea69f19f01f718dedb339ec854693572058cc0 | |
| parent | 81d40fe05519c422ef39ae63bac125d37068b82d (diff) | |
Allow building docs from any directory
Also just remove the .git check completely - just rely on make skipping
it if it exists already.
| -rw-r--r-- | doc/Makefile | 3 | ||||
| -rw-r--r-- | doc/user-guide/Makefile | 4 | ||||
| -rw-r--r-- | doc/user-guide/genhelp.py | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/doc/Makefile b/doc/Makefile index 69471d32..8cf485e9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,8 +4,7 @@ _SRCDIR_ := $(_SRCDIR_)doc/ endif all: - # Only build the docs if this is a git tree - test ! '(' -d ../.git -o -d ../.bzr ')' || $(MAKE) -C user-guide + $(MAKE) -C user-guide install: mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/ diff --git a/doc/user-guide/Makefile b/doc/user-guide/Makefile index 62107ab7..28dd56ec 100644 --- a/doc/user-guide/Makefile +++ b/doc/user-guide/Makefile @@ -30,8 +30,8 @@ help.xml: commands.xml %.db.xml: %.xml docbook.xsl xsltproc --xinclude --output $@ docbook.xsl $< -help.txt: help.xml help.xsl commands.xml misc.xml quickstart.xml - python genhelp.py $< $@ +help.txt: $(_SRCDIR_)help.xml $(_SRCDIR_)commands.xml $(_SRCDIR_)misc.xml $(_SRCDIR_)quickstart.xml + python $(_SRCDIR_)genhelp.py $< $@ clean: rm -f *.html *.pdf *.ps *.rtf *.txt *.db.xml diff --git a/doc/user-guide/genhelp.py b/doc/user-guide/genhelp.py index c43c8d23..b6a23c11 100644 --- a/doc/user-guide/genhelp.py +++ b/doc/user-guide/genhelp.py @@ -19,6 +19,7 @@ # Boston, MA 02110-1301, USA. +import os import re import sys import xml.etree.ElementTree as ET @@ -221,6 +222,9 @@ def main(): print("Usage: python genhelp.py input.xml output.txt") return + # ensure that we really are in the same directory as the input file + os.chdir(os.path.dirname(os.path.abspath(sys.argv[1]))) + txt = process_file(sys.argv[1]) open(sys.argv[2], "w").write(txt) |