exiwhat: use RM_COMMAND

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index bb250ff91506c74cc7410d5261f058329a6e4ad2..6aab029ad9a26d75e96d8cfe6715fb5f74e7d411 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -319,6 +319,7 @@ exiwhat: config ../src/exiwhat.src
          -e "s?EXIWHAT_MULTIKILL_ARG?$(EXIWHAT_MULTIKILL_ARG)?" \
          -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
          -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
+         -e "s?RM_COMMAND?$(RM_COMMAND)?" \
          ../src/exiwhat.src > exiwhat-t
        @mv exiwhat-t exiwhat
        @chmod a+x exiwhat

diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index 4fdc09f785563009b16f7f4f311fa2df866879d6..a1f748edd570ed75df0955448adcfca2e001adc5 100644 (file)
--- a/src/src/exiwhat.src
+++ b/src/src/exiwhat.src
@@ -15,6 +15,7 @@
 # EXIWHAT_EGREP_ARG
 # EXIWHAT_MULTIKILL_CMD
 # EXIWHAT_MULTIKILL_ARG
+# RM_COMMAND
 
 # PROCESSED_FLAG
 
@@ -29,6 +30,8 @@
 # the script in the next Exim rebuild/install. However, it's best to
 # arrange your build-time configuration file to get the correct values.
 
+rm=RM_COMMAND
+
 # Some operating systems have a command that finds processes that match
 # certain conditions (by default usually those running specific commands)
 # and sends them signals. If such a command is defined for your OS, the
@@ -110,7 +113,7 @@ fi
 
 # Now do the job.
 
-/bin/rm -f ${log}
+$rm -f ${log}
 if [ -f ${log} ]; then
   echo "** Failed to remove ${log}"
   exit 1