summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-12-20 23:59:50 +0100
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2017-12-21 21:41:27 +0100
commit6d56f3f49a8d372a034477ba0d8969805e4fc23f (patch)
tree506d6089953c91daba414cd3beb97afc95fed508 /src
parent3674140cddab39c76f4cd360a4b5c102e94d4759 (diff)
exiwhat: use RM_COMMAND
Diffstat (limited to 'src')
-rw-r--r--src/OS/Makefile-Base1
-rw-r--r--src/src/exiwhat.src5
2 files changed, 5 insertions, 1 deletions
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