From 8afee310534f1f7b8e9bbb1dfbb76a604906377f Mon Sep 17 00:00:00 2001
From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sat, 18 Jun 2016 23:07:55 -0700
Subject: [PATCH] doc/Makefile.in: Define docdir; fix PACKAGE_TARNAME (part of
 docdir)

---
 doc/Makefile.in    | 3 ++-
 doc/configure.ac   | 5 +----
 doc/make-common.in | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0a77b6925..e526a4b1b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -44,6 +44,7 @@ libdir = @libdir@
 infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
+docdir = @docdir@
 oldincludedir = /usr/include
 
 DESTDIR =
@@ -64,7 +65,7 @@ htmldir = @htmldir@
 pdfdir = @pdfdir@
 psdir = @psdir@
 INST_TARGETS = @INST_TARGETS@
-PROJECT_NAME = @PROJECT_NAME@
+PROJECT_NAME = @PACKAGE_TARNAME@
 
 SUBDIRS = ffi ref-manual sos user-manual
 DISTCLEAN_FILES = Makefile make-common config.log config.status
diff --git a/doc/configure.ac b/doc/configure.ac
index 4147d4423..2538cd4b8 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([MIT/GNU Scheme documentation],
 	[9.2.1],
 	[puck@birchwood-abbey.net],
-	[mit-scheme-pucked-doc])
+	[mit-scheme-pucked])
 AC_CONFIG_SRCDIR([ref-manual/scheme.texinfo])
 
 AC_COPYRIGHT(
@@ -75,9 +75,6 @@ test "${psdir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT).ps"
 test "${psdir}" = "" || INST_TARGETS="${INST_TARGETS} install-ps"
 AC_SUBST([psdir])
 
-PROJECT_NAME=mit-scheme-pucked
-AC_SUBST([PROJECT_NAME])
-
 AC_SUBST([TARGETS])
 AC_SUBST([INST_TARGETS])
 
diff --git a/doc/make-common.in b/doc/make-common.in
index 5258f35e9..7a2e06d6c 100644
--- a/doc/make-common.in
+++ b/doc/make-common.in
@@ -56,6 +56,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 # **** END BOILERPLATE ****
 
+docdir = @docdir@
 htmldir = @htmldir@
 pdfdir = @pdfdir@
 psdir = @psdir@
-- 
2.25.1