Add backward compatibility for EXIM_TMPDIR

diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index eeb26eeb144aac84736efd0788c14be1fafbd4cb..8f40d1c95c7af1e5cdf81ae741db4df5caf866c6 100755 (executable)
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -110,7 +110,9 @@ do   if test -r ../$f
             echo "# End of $f"
             echo ""
      fi
             echo "# End of $f"
             echo ""
      fi

-done >> $mft || exit 1
+done \
+     | sed 's/^TMPDIR=/EXIM_&/' \
+     >> $mft || exit 1

 
 # handle pkg-config
 # beware portability of extended regexps with sed.
 
 # handle pkg-config
 # beware portability of extended regexps with sed.

diff --git a/src/src/EDITME b/src/src/EDITME
index 6afe0c74c6129dcd698a0d1b5c5c86090b17589c..38321ecb276dc6ba89a5ec4323be8490cb4b6b26 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -1121,7 +1121,9 @@ SYSTEM_ALIASES_FILE=/etc/aliases
 # files, and thus be influenced by the value of TMPDIR. For this reason, when
 # Exim starts, it checks the environment for TMPDIR, and if it finds it is set,
 # it replaces the value with what is defined here. Commenting this setting
 # files, and thus be influenced by the value of TMPDIR. For this reason, when
 # Exim starts, it checks the environment for TMPDIR, and if it finds it is set,
 # it replaces the value with what is defined here. Commenting this setting

-# suppresses the check altogether.
+# suppresses the check altogether. Older installations call this macro
+# just TMPDIR, but this has side effects at build time. At runtime
+# TMPDIR is checked as before.

 
 EXIM_TMPDIR="/tmp"
 
 
 EXIM_TMPDIR="/tmp"
 

diff --git a/src/src/exim.c b/src/src/exim.c
index c134bf5e6e441bb95c46bc4d8a2c6f8203489c52..02f2a9a4db1affa98de47f5f1495f05ec3a11f5a 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -3899,7 +3899,10 @@ if (log_oneline)
 temporary files are created; Exim doesn't use these (apart from when delivering
 to MBX mailboxes), but called libraries such as DBM libraries may require them.
 If TMPDIR is found in the environment, reset it to the value defined in the
 temporary files are created; Exim doesn't use these (apart from when delivering
 to MBX mailboxes), but called libraries such as DBM libraries may require them.
 If TMPDIR is found in the environment, reset it to the value defined in the

-EXIM_TMPDIR macro, if this macro is defined. */
+EXIM_TMPDIR macro, if this macro is defined.  For backward compatibility this
+macro may be called TMPDIR in old "Local/Makefile"s. It's converted to
+EXIM_TMPDIR by the build scripts.
+*/

 
 #ifdef EXIM_TMPDIR
   {
 
 #ifdef EXIM_TMPDIR
   {