Changeset b75671d for doc/user-guide/Makefile

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:

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

doc/user-guide/Makefile

@@ -4 +4 @@
 endif
 
-EXTRAPARANEWLINE = 1
-# EXTRAPARANEWLINE = 0
+ifndef PYTHON
+PYTHON = python
+endif 
 
-all: user-guide.txt user-guide.html help.txt # user-guide.pdf user-guide.ps user-guide.rtf
+all: help.txt
+
+user-guide: user-guide.txt user-guide.html # user-guide.pdf user-guide.ps user-guide.rtf
 
 %.tex: %.db.xml
@@ -32 +35 @@
         xsltproc --xinclude --output $@ docbook.xsl $< 
 
-help.txt: help.xml help.xsl commands.xml misc.xml quickstart.xml
-        xsltproc --stringparam extraparanewline "$(EXTRAPARANEWLINE)" --xinclude help.xsl $< | perl -0077 -pe 's/\n\n%/\n%/s; s/_b_/\002/g;' > $@
+help.txt: $(_SRCDIR_)help.xml $(_SRCDIR_)commands.xml $(_SRCDIR_)misc.xml $(_SRCDIR_)quickstart.xml
+        $(PYTHON) $(_SRCDIR_)genhelp.py $< $@
 
 clean: 
@@ -48 +51 @@
         -rmdir $(DESTDIR)$(DATADIR)
 
-.PHONY: clean install uninstall
+.PHONY: clean install uninstall user-guide