From f68db5d1145691c72d530d0d6ad965f0fbc10d54 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 17 May 2017 15:11:35 -0700
Subject: [PATCH] doc: Define PACKAGE_TARNAME, part of the default docdir.

Also define PROJECT to make it easier to change the project name.
---
 doc/Makefile.in    | 5 ++++-
 doc/configure.ac   | 5 ++---
 doc/make-common.in | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3bd9c2b22..937d0e9f4 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -47,6 +47,9 @@ includedir = @includedir@
 docdir = @docdir@
 oldincludedir = /usr/include
 
+PACKAGE_TARNAME = @PROJECT@
+PROJECT = @PROJECT@
+
 DESTDIR =
 top_builddir = .
 
@@ -117,7 +120,7 @@ install-info-gz install-info:
 
 install-man:
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
-	$(INSTALL_DATA) mit-scheme.1 $(DESTDIR)$(mandir)/man1/.
+	$(INSTALL_DATA) ${PROJECT}.1 $(DESTDIR)$(mandir)/man1/.
 
 install-html:
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
diff --git a/doc/configure.ac b/doc/configure.ac
index 5164662f5..efb269bd9 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -39,6 +39,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_CHECK_PROG([INSTALL_INFO_PROG], [install-info], [install-info], [true])
 
+PROJECT=mit-scheme
 TARGETS=
 INST_TARGETS=
 
@@ -51,7 +52,6 @@ elif test "${enable_html:-yes}" != "yes"; then
 fi
 test "${htmldir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT)/index.html"
 test "${htmldir}" = "" || INST_TARGETS="${INST_TARGETS} install-html"
-AC_SUBST([htmldir])
 
 AC_ARG_ENABLE([pdf],
 	[AC_HELP_STRING([--enable-pdf], [generate PDF documentation])])
@@ -62,7 +62,6 @@ elif test "${enable_pdf:-yes}" != "yes"; then
 fi
 test "${pdfdir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT).pdf"
 test "${pdfdir}" = "" || INST_TARGETS="${INST_TARGETS} install-pdf"
-AC_SUBST([pdfdir])
 
 AC_ARG_ENABLE([ps],
 	[AC_HELP_STRING([--enable-ps], [generate Postscript documentation])])
@@ -73,8 +72,8 @@ elif test "${enable_ps}" != "yes"; then
 fi
 test "${psdir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT).ps"
 test "${psdir}" = "" || INST_TARGETS="${INST_TARGETS} install-ps"
-AC_SUBST([psdir])
 
+AC_SUBST([PROJECT])
 AC_SUBST([TARGETS])
 AC_SUBST([INST_TARGETS])
 
diff --git a/doc/make-common.in b/doc/make-common.in
index 91724bb48..ef0c7fc70 100644
--- a/doc/make-common.in
+++ b/doc/make-common.in
@@ -37,11 +37,14 @@ sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@
 localstatedir = @localstatedir@
 libdir = @libdir@
+docdir = @docdir@
 infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
+PROJECT = @PROJECT@
+
 DESTDIR =
 top_builddir = .
 
-- 
2.25.1