--- scripts/exim_install.orig	2009-10-30 16:14:04.000000000 +0100
+++ scripts/exim_install	2009-11-17 09:54:49.000000000 +0100
@@ -378,21 +378,10 @@
 
 echo $com ""
 
-if [ `expr -- "${CONFIGURE_FILE}" : ".*:"` -ne 0 ] ; then
-  echo $com Runtime configuration is specified as the following list:
-  echo $com ' ' ${CONFIGURE_FILE}
-  echo $com Therefore, skipping automatic installation.
-
-elif [ ! -f ${CONFIGURE_FILE} ]; then
   echo $com Installing default configuration in ${CONFIGURE_FILE}
   echo $com because there is no existing configuration file.
-  if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; then
-    SYSTEM_ALIASES_FILE=/etc/aliases
-    echo $com This configuration has system aliases in ${SYSTEM_ALIASES_FILE}.
-  fi
-
-  echo ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}`
-  ${real} ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}`
+  SYSTEM_ALIASES_FILE=aliases.dist
+	CONFIGURE_FILE=exim.conf.dist
 
   echo sed -e '\\'
   echo "  \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'\"" '\\'
@@ -425,10 +414,6 @@
     ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
   fi
 
-else
-  echo $com Configuration file ${CONFIGURE_FILE} already exists
-fi
-
 # Install info files if the directory is defined and the Texinfo
 # source documentation is present.