From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 00:36:38 +0000 (+0000)
Subject: build system: Do not use autoconf's `rm'
X-Git-Tag: v0.5.1~37
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=3af7483b2b8e093f79f133f6f2f496e5ce203eb1

build system: Do not use autoconf's `rm'

This is /bin/rm.  But make's builtin is `rm -f' which is better.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/common.make.in b/common.make.in
index 91d7312..1e3139e 100644
--- a/common.make.in
+++ b/common.make.in
@@ -22,7 +22,6 @@
 topbuilddir:=@abs_top_builddir@
 
 SHELL:=/bin/sh
-RM:=@RM@
 CC:=@CC@
 
 CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
diff --git a/configure b/configure
index 33300d1..6f8d498 100755
--- a/configure
+++ b/configure
@@ -629,7 +629,6 @@ WRITESTRINGS
 EGREP
 GREP
 CPP
-RM
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
@@ -3360,46 +3359,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-# Extract the first word of "rm", so it can be a program name with args.
-set dummy rm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $RM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RM="$RM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-RM=$ac_cv_path_RM
-if test -n "$RM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
-$as_echo "$RM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
diff --git a/configure.ac b/configure.ac
index e5abd68..9c65460 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ fi
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PATH_PROG(RM,rm)
 AC_STDC_HEADERS
 AC_CHECK_HEADERS([stdint.h inttypes.h])
 AC_CHECK_HEADERS([net/if.h net/route.h])
diff --git a/test-example/Makefile.in b/test-example/Subdir.sd.mk
similarity index 100%
rename from test-example/Makefile.in
rename to test-example/Subdir.sd.mk