shithub: choc

Download patch

ref: 74e0e0c740f58d3e0e1643dca7d3dfe9d895c41b
parent: 679c98f0bff21de7e737dd36ab8a0e1052a5335d
author: Simon Howard <fraggle@soulsphere.org>
date: Sun May 27 16:25:43 EDT 2018

docgen: Fix wiki text generation.

This got broken by some recent changes. As part of this, remove a
now-deleted wiki page and also add a Makefile target to build the page
(for Doom, at least).

--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -78,6 +78,10 @@
                   -p $(srcdir)/CMDLINE.template \
                   $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
 
+CMDLINE.doom.wikitext : $(top_srcdir)/src $(top_srcdir)/src/doom
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -w $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
+
 INSTALL.doom: INSTALL.template
 	$(srcdir)/simplecpp -DDOOM $(WIN32) \
             -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
--- a/man/docgen
+++ b/man/docgen
@@ -456,7 +456,7 @@
 
     print_template(template_file, substs, content)
 
-def wiki_output(targets, template):
+def wiki_output(targets, _, template):
     read_wikipages()
 
     for t in targets:
--- a/man/wikipages
+++ b/man/wikipages
@@ -2,7 +2,6 @@
 # wikitext output.
 Dehacked
 Doom 1.91
-Configuration
 Merging
 Multiplayer
 Three screen mode