Ignore:
Timestamp:
2015-06-08T18:25:08Z (10 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:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/user-guide/Makefile

    rc720890 re4f08bf  
    33_SRCDIR_ := $(_SRCDIR_)doc/user-guide/
    44endif
     5
     6ifndef PYTHON
     7PYTHON = python
     8endif
    59
    610all: help.txt
     
    3135        xsltproc --xinclude --output $@ docbook.xsl $<
    3236
    33 help.txt: help.xml help.xsl commands.xml misc.xml quickstart.xml
    34         python genhelp.py $< $@
     37help.txt: $(_SRCDIR_)help.xml $(_SRCDIR_)commands.xml $(_SRCDIR_)misc.xml $(_SRCDIR_)quickstart.xml
     38        $(PYTHON) $(_SRCDIR_)genhelp.py $< $@
    3539
    3640clean:
Note: See TracChangeset for help on using the changeset viewer.