Changeset a1d30c5 for doc/user-guide/Makefile

Timestamp:

2015-05-28T04:12:23Z (10 years ago)

Author:

dequis <dx@…>

Children:

d2d2b80

Parents:

ec8b369 (diff), 3d31618 (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

File:

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

doc/user-guide/Makefile

@@ -4 +4 @@
 endif
 
-EXTRAPARANEWLINE = 1
-# EXTRAPARANEWLINE = 0
+all: help.txt
 
-all: user-guide.txt user-guide.html help.txt # user-guide.pdf user-guide.ps user-guide.rtf
+user-guide: user-guide.txt user-guide.html # user-guide.pdf user-guide.ps user-guide.rtf
 
 %.tex: %.db.xml
@@ -33 +32 @@
 
 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;' > $@
+        python genhelp.py $< $@
 
 clean: 
@@ -48 +47 @@
         -rmdir $(DESTDIR)$(DATADIR)
 
-.PHONY: clean install uninstall
+.PHONY: clean install uninstall user-guide