Changeset fd45e859

Timestamp:

2015-06-04T17:13:22Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1cef55f

Parents:

81d40fe

git-author:

dequis <dx@…> (31-05-15 23:50:08)

git-committer:

dequis <dx@…> (04-06-15 17:13:22)

Message:

Allow building docs from any directory

Also just remove the .git check completely - just rely on make skipping
it if it exists already.

Location:

doc

Files:

• Makefile (modified) (1 diff)
• user-guide/Makefile (modified) (1 diff)
• user-guide/genhelp.py (modified) (2 diffs)

doc/Makefile

@@ -5 +5 @@
 
 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:

doc/user-guide/Makefile

@@ -31 +31 @@
         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: 

doc/user-guide/genhelp.py

@@ -20 +20 @@
 
 
+import os
 import re
 import sys
@@ -222 +223 @@
         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)