krb5 commit [krb5-1.19]: Fix runstatedir makefile substitution

[Greg Hudson]

https://github.com/krb5/krb5/commit/5d6fc4604750bd3755e57cb83200f1d9aa49a990
commit 5d6fc4604750bd3755e57cb83200f1d9aa49a990
Author: Greg Hudson <ghudson at mit.edu>
Date:   Tue Jan 5 14:37:44 2021 -0500

    Fix runstatedir makefile substitution
    
    Set localstatedir and runstatedir in config/pre.in so that the default
    runstatedir value of ${localstatedir}/run works.  Reported by Mike
    Jetzer.
    
    (cherry picked from commit fd005a1967510004c9197f7da9f1d85ee81f4734)
    
    ticket: 8975
    version_fixed: 1.19

 src/Makefile.in     |    4 ++--
 src/config/pre.in   |    3 ++-
 src/configure.ac    |    2 +-
 src/doc/Makefile.in |    2 --
 src/man/Makefile.in |    2 --
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index f9270ab..7d2507e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -71,8 +71,8 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROOT) $(KRB5OTHERMKDIRS) \
 		$(KRB5_DB_MODULE_DIR) $(KRB5_PA_MODULE_DIR) \
 		$(KRB5_AD_MODULE_DIR) \
 		$(KRB5_LIBKRB5_MODULE_DIR) $(KRB5_TLS_MODULE_DIR) \
-		@localstatedir@ @localstatedir@/krb5kdc \
-		@runstatedir@ @runstatedir@/krb5kdc \
+		$(localstatedir) $(localstatedir)/krb5kdc \
+		$(runstatedir) $(runstatedir)/krb5kdc \
 		$(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR) \
 		$(PKGCONFIG_DIR)
 
diff --git a/src/config/pre.in b/src/config/pre.in
index 7b3a583..3752174 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -192,7 +192,8 @@ INSTALL_PREFIX=$(prefix)
 INSTALL_EXEC_PREFIX=@exec_prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
-
+localstatedir=@localstatedir@
+runstatedir=@runstatedir@
 datadir = @datadir@
 EXAMPLEDIR = $(datadir)/examples/krb5
 
diff --git a/src/configure.ac b/src/configure.ac
index 4981492..4eb0807 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2,7 +2,7 @@ K5_AC_INIT([aclocal.m4])
 
 # If $runstatedir isn't set by autoconf (<2.70), set it manually.
 if test x"$runstatedir" = x; then
-  runstatedir=$localstatedir/run
+  runstatedir='${localstatedir}/run'
 fi
 AC_SUBST(runstatedir)
 
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index d635bff..379bc36 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -6,8 +6,6 @@ SPHINX_BUILD=sphinx-build $(SPHINX_ARGS)
 DOXYGEN=doxygen
 
 docsrc=$(top_srcdir)/../doc
-localstatedir=@localstatedir@
-runstatedir=@runstatedir@
 sysconfdir=@sysconfdir@
 DEFCCNAME=@DEFCCNAME@
 DEFKTNAME=@DEFKTNAME@
diff --git a/src/man/Makefile.in b/src/man/Makefile.in
index e3722b1..00b1b2d 100644
--- a/src/man/Makefile.in
+++ b/src/man/Makefile.in
@@ -4,8 +4,6 @@ BUILDTOP=$(REL)..
 SPHINX_BUILD=sphinx-build
 GROFF=@GROFF@
 GROFF_MAN=$(GROFF) -mtty-char -Tascii -mandoc -c
-localstatedir=@localstatedir@
-runstatedir=@runstatedir@
 sysconfdir=@sysconfdir@
 DEFCCNAME=@DEFCCNAME@
 DEFKTNAME=@DEFKTNAME@