Changeset e4f08bf for doc/user-guide/Makefile

Timestamp:

2015-06-08T18:25:08Z (9 years ago)

Author:

dequis <dx@…>

Children:

29ff5c2

Parents:

c720890 (diff), 61e7e02 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

configure

File:

• doc/user-guide/Makefile (modified) (2 diffs)

doc/user-guide/Makefile

@@ -3 +3 @@
 _SRCDIR_ := $(_SRCDIR_)doc/user-guide/
 endif
+
+ifndef PYTHON
+PYTHON = python
+endif 
 
 all: help.txt
@@ -31 +35 @@
         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: