From: Peter Maydell <pmaydell@chiark.greenend.org.uk>
Date: Wed, 10 Nov 2010 22:26:07 +0000 (+0000)
Subject: configure.in: add a level of expansion for mandir when printing the
X-Git-Tag: cvs-repository-moved-to-git~3
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;ds=sidebyside;h=682769680c6e77bf8cf797c23eccd1d4e2753066;p=mmh

configure.in: add a level of expansion for mandir when printing the
end-of-configure install path summary.
---

diff --git a/ChangeLog b/ChangeLog
index 5d0f230..556418a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-10  Peter Maydell <pmaydell@chiark.greenend.org.uk>
+
+	* configure.in: add a level of expansion for mandir
+	  when printing the end-of-configure install path
+	  summary.
+
 2010-11-09  Peter Maydell <pmaydell@chiark.greenend.org.uk>
 
 	* man/rmm.man: fix error in synopsis: the option is
diff --git a/configure.in b/configure.in
index 6d4a9d4..e43fca1 100644
--- a/configure.in
+++ b/configure.in
@@ -1057,11 +1057,17 @@ AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
 AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h])
 AC_OUTPUT
 
-dnl Umm, what's the point of these assignments??  -- <dan-nmh@dilvish.speed.net>
-eval "nmhbin=${bindir}";         eval "nmhbin2=${nmhbin}"
-eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
-eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
-eval "nmhman=${mandir}"
+dnl These odd looking assignments are done to expand out unexpanded
+dnl variables in bindir et al (for instance mandir is '${datarootdir}/man',
+dnl but expanding that gives '${prefix}/share/man', so we need to expand
+dnl again to get the final answer.
+dnl We only use the expanded versions to print the install paths in
+dnl the final summary and should use them nowhere else (see the autoconf
+dnl docs for the rationale for bindir etc being unexpanded).
+eval "nmhbin=${bindir}";         eval "nmhbin=${nmhbin}"
+eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
+eval "nmhlib=${libdir}";         eval "nmhlib=${nmhlib}"
+eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 
 pop_kinds=no
 if test x"$enable_pop" = x"yes"; then
@@ -1088,9 +1094,9 @@ compiler flags             : ${CFLAGS}
 linker flags               : ${LDFLAGS}
 definitions                : ${OURDEFS}
 source code location       : ${srcdir}
-binary install path        : ${nmhbin2}
-libary install path        : ${nmhlib2}
-config files install path  : ${nmhsysconf2}
+binary install path        : ${nmhbin}
+library install path       : ${nmhlib}
+config files install path  : ${nmhsysconf}
 man page install path      : ${nmhman}
 backup prefix              : ${backup_prefix}
 transport system           : ${MTS}