From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 5 Jan 2021 19:37:44 +0000 (-0500)
Subject: Fix runstatedir makefile substitution
X-Git-Tag: krb5-1.20-beta1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd005a1967510004c9197f7da9f1d85ee81f4734;p=thirdparty%2Fkrb5.git

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.

ticket: 8975
tags: pullup
target_version: 1.19
target_version: 1.18-next
target_version: 1.17-next
---

diff --git a/src/Makefile.in b/src/Makefile.in
index f9270aba25..7d2507ef80 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 7b3a583ccb..3752174c7a 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 7cbd647848..61778dcd0b 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 d635bff9a4..379bc36511 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 e3722b1cdc..00b1b2de06 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@