From: tv Date: Wed, 20 Dec 2017 22:59:50 +0000 (+0100) Subject: exiwhat: use RM_COMMAND X-Git-Tag: exim-4_91_RC1~144 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/6d56f3f49a8d372a034477ba0d8969805e4fc23f exiwhat: use RM_COMMAND --- diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index bb250ff91..6aab029ad 100644 --- 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 4fdc09f78..a1f748edd 100644 --- 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