--- scripts/exim_install.orig	Mon Aug  2 17:43:03 1999
+++ scripts/exim_install	Tue Aug  3 14:31:20 1999
@@ -195,25 +195,40 @@
   fi
 done
 
+# Install exim.sh startup script in FreeBSD's ${PREFIX}/etc/rc.d so that
+# exim will start up on boot once sendmail is disabled and
+# ${PREFIX}/etc/exim/configure is in place.
 
+echo $com ""
 
-# If there is no configuration file, install the default.
+if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
+  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
+else
+  echo $com "Installing exim.sh startup script in ${PREFIX}/etc/rc.d"
+  ${real} mkdir -p ${PREFIX}/etc/rc.d
+  echo ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
+  ${real} ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
+  if [ $? -ne 0 ]; then
+    echo $com ""
+    echo $com "**** Exim installation ${ver}failed ****"
+    exit 1
+  fi
+fi
+
+# Install only a sample configuration, which encourages the admin to look
+# at it, since Exim won't run without a configure file.
 
 echo $com ""
 
-if [ ! -f ${CONFIGURE_FILE} ]; then
-  echo $com Installing default configuration in ${CONFIGURE_FILE}
-  echo $com because there is no existing configuration file.
-  echo ${CP} ../src/configure.default ${CONFIGURE_FILE}
-  ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}
+  echo $com Installing sample configuration file
+  ${real} mkdir -p ${CONFIGURE_FILE%/*}
+  echo ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
+  ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
   if [ $? -ne 0 ]; then
     echo $com ""
     echo $com "*** Exim installation ${ver}failed ***"
     exit 1
   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.
@@ -235,19 +250,21 @@
   echo $com Info installation directory is ${INFO_DIRECTORY}
   echo $com ""
 
-  makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
+  makeinfo --no-validate --no-split --output exim_overview.info \
+      ../doc/oview.texinfo
   echo ${CP} exim_overview.info ${INFO_DIRECTORY}
   ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
   install-info --section="Exim" \
       --entry "* Overview: (exim_overview).    Overview of the Exim system" \
       ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
-  makeinfo --no-split --output exim.info ../doc/spec.texinfo
+  makeinfo --no-validate --no-split --output exim.info ../doc/spec.texinfo
   echo ${CP} exim.info ${INFO_DIRECTORY}
   ${real} ${CP} exim.info ${INFO_DIRECTORY}
   install-info --section="Exim" \
       --entry "* User guide: (exim).           Exim manual" \
       ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
-  makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
+  makeinfo --no-validate --no-split --output exim_filter.info \
+      ../doc/filter.texinfo
   echo ${CP} exim_filter.info ${INFO_DIRECTORY}
   ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
   install-info --section="Exim" \