commit 74e0e0c740f58d3e0e1643dca7d3dfe9d895c41b
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun May 27 20:25:43 2018 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun May 27 20:25:43 2018 -0400
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).
---
man/Makefile.am | 4 ++++
man/docgen | 2 +-
man/wikipages | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/man/Makefile.am b/man/Makefile.am
index 78ef3952..9388d60d 100644
--- 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
index 3f521e3a..4c203f0a 100755
--- 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
index 5b5ce6ba..429c47dd 100644
--- a/man/wikipages
+++ b/man/wikipages
@@ -2,7 +2,6 @@
# wikitext output.
Dehacked
Doom 1.91
-Configuration
Merging
Multiplayer
Three screen mode