diff options
| author | Greg Hudson <ghudson@mit.edu> | 2021-01-05 14:37:44 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2021-01-08 11:47:56 -0500 |
| commit | b399721b5aedacc490158c04f6a3fa77c98f0b62 (patch) | |
| tree | 3ea75cee8264cd560d86c12f90a2daabda43492d | |
| parent | 40d24000786643a012e23f67ffeb4402fa2b4821 (diff) | |
| download | krb5-1.17.tar.gz | |
Fix runstatedir makefile substitutionkrb5-1.17
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.17.3
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/config/pre.in | 3 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/doc/Makefile.in | 2 | ||||
| -rw-r--r-- | src/man/Makefile.in | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 91a5f4bf8..c8aff3900 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -70,8 +70,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 ce87e21ca..e47f5f073 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.in b/src/configure.in index 36df71fa9..cbae89ea1 100644 --- a/src/configure.in +++ b/src/configure.in @@ -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 d635bff9a..379bc3651 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 e3722b1cd..00b1b2de0 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@ |