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).
MichaelBell · May 28, 2018 · 74e0e0c · 74e0e0c
1 parent 679c98f
commit 74e0e0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/man/Makefile.am b/man/Makefile.am
@@ -78,6 +78,10 @@ CMDLINE.doom : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/doom
                   -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" \

diff --git a/man/docgen b/man/docgen
@@ -456,7 +456,7 @@ def manpage_output(targets, substs, template_file):
 
     print_template(template_file, substs, content)
 
-def wiki_output(targets, template):
+def wiki_output(targets, _, template):
     read_wikipages()
 
     for t in targets:

diff --git a/man/wikipages b/man/wikipages
@@ -2,7 +2,6 @@
 # wikitext output.
 Dehacked
 Doom 1.91
-Configuration
 Merging
 Multiplayer
 Three screen mode