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 f9270aba25381650bd8b0e492db7d7a481006bac..7d2507ef80716f9295ee401a179e60648c70e4b8 100644 (file)
--- 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 7b3a583ccbe6b856d334e49b29ae20a12134adc2..3752174c7a5d7283956d823033034d085b9e6360 100644 (file)
--- 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 7cbd6478485a454076f9dc701434caf28ee6bb8e..61778dcd0b972631c98b90db2175521453894878 100644 (file)
--- 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 d635bff9a45888420545ea5c1a884414a0de0969..379bc36511a835dc5aaf76dbf770a03de69725eb 100644 (file)
--- 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 e3722b1cdc69741e7e9c4d2ff93d54d28f7abeb2..00b1b2de06a144feb86b2837faaab7c9cdcf749c 100644 (file)
--- 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@