Ignore:
Timestamp:
2015-06-17T22:47:26Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Children:
b441614
Parents:
d832164 (diff), 2f99f23 (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 remote-tracking branch 'origin/master' into parson

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/user-guide/Makefile

    rd832164 rb75671d  
    44endif
    55
    6 EXTRAPARANEWLINE = 1
    7 # EXTRAPARANEWLINE = 0
     6ifndef PYTHON
     7PYTHON = python
     8endif
    89
    9 all: user-guide.txt user-guide.html help.txt # user-guide.pdf user-guide.ps user-guide.rtf
     10all: help.txt
     11
     12user-guide: user-guide.txt user-guide.html # user-guide.pdf user-guide.ps user-guide.rtf
    1013
    1114%.tex: %.db.xml
     
    3235        xsltproc --xinclude --output $@ docbook.xsl $<
    3336
    34 help.txt: help.xml help.xsl commands.xml misc.xml quickstart.xml
    35         xsltproc --stringparam extraparanewline "$(EXTRAPARANEWLINE)" --xinclude help.xsl $< | perl -0077 -pe 's/\n\n%/\n%/s; s/_b_/\002/g;' > $@
     37help.txt: $(_SRCDIR_)help.xml $(_SRCDIR_)commands.xml $(_SRCDIR_)misc.xml $(_SRCDIR_)quickstart.xml
     38        $(PYTHON) $(_SRCDIR_)genhelp.py $< $@
    3639
    3740clean:
     
    4851        -rmdir $(DESTDIR)$(DATADIR)
    4952
    50 .PHONY: clean install uninstall
     53.PHONY: clean install uninstall user-guide
Note: See TracChangeset for help on using the changeset viewer.