ref: 60c3beb6933cfa88d21b4e1120ec540a1cc77dde
parent: 50f881cdc237d6c35111c13f10cb91e27df8e2cd
parent: 497514e39d58b1a8d48b34a8c94275fbefca5eaf
author: Simon Howard <fraggle@soulsphere.org>
date: Sat Jan 20 21:44:07 EST 2018
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,6 +79,8 @@
INSTALL : man/INSTALL.template man/simplecpp
./man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
+ -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
+ -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
< man/INSTALL.template > $@
endif
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -74,8 +74,8 @@
INSTALL.doom: INSTALL.template
$(srcdir)/simplecpp -DDOOM \
- -D LONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
- -D LONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
+ -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
+ -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
-DPRECOMPILED < $(srcdir)/INSTALL.template > $@
@PROGRAM_PREFIX@heretic.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) heretic.template
@@ -100,8 +100,8 @@
INSTALL.heretic: INSTALL.template
$(srcdir)/simplecpp -DHERETIC \
- -D LONG_GAME_NAME="@PACKAGE_SHORTNAME@ Heretic" \
- -D LONG_EXE_NAME="@PROGRAM_PREFIX@heretic" \
+ -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Heretic" \
+ -DLONG_EXE_NAME="@PROGRAM_PREFIX@heretic" \
-DPRECOMPILED < $(srcdir)/INSTALL.template > $@
@@ -127,8 +127,8 @@
INSTALL.hexen: INSTALL.template
$(srcdir)/simplecpp -DHEXEN \
- -D LONG_GAME_NAME="@PACKAGE_SHORTNAME@ Hexen" \
- -D LONG_EXE_NAME="@PROGRAM_PREFIX@hexen" \
+ -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Hexen" \
+ -DLONG_EXE_NAME="@PROGRAM_PREFIX@hexen" \
-DPRECOMPILED < $(srcdir)/INSTALL.template > $@
@PROGRAM_PREFIX@strife.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
@@ -171,7 +171,9 @@
INSTALL: INSTALL.template
$(srcdir)//simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
- -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
+ -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
+ -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
+ -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
endif
--- a/man/bash-completion/Makefile.am
+++ b/man/bash-completion/Makefile.am
@@ -19,7 +19,7 @@
MANDIR = $(top_srcdir)/man
DOCGEN = $(MANDIR)/docgen
-DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@"
+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@"
@PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
--- a/man/server.template
+++ b/man/server.template
@@ -6,7 +6,7 @@
[OPTIONS]
.SH DESCRIPTION
.PP
-@PACKAGE_SHORTNAME@ is a modern doom engine designed to behave
+@PACKAGE_NAME@ is a modern doom engine designed to behave
as similar to the original doom game as is possible.
.PP
.B @PROGRAM_SPREFIX@\-server
--- a/man/strife.template
+++ b/man/strife.template
@@ -62,7 +62,7 @@
might notice between this executable and the vanilla DOS program.
However, do *not* report any glitch that you can replicate in the vanilla EXE
-as a bug. The point of @PACKAGE_SHORTNAME Strife, like Chocolate Doom before it, is to
+as a bug. The point of @PACKAGE_SHORTNAME@ Strife, like Chocolate Doom before it, is to
be as bug-compatible with the original game as possible. Also be aware that
some glitches are impossible to compatibly recreate, and wherever this is the
case, @PACKAGE_SHORTNAME@ Strife has erred on the side of not crashing the program,