[x264-devel] [PATCH 4/4] Recursively delete conftest files

[Vittorio Giovara]

On Mac OS X, one of the conftest files might be a directory
named "conftest.dSYM".
---
Updated according review.
Vittorio

 Makefile  | 2 +-
 configure | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d0b1633..d97c9e6 100644
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,7 @@ clean:
 	rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock *.pgd *.pgc
 
 distclean: clean
-	rm -f config.mak x264_config.h config.h config.log x264.pc x264.def conftest*
+	rm -rf config.mak x264_config.h config.h config.log x264.pc x264.def conftest*
 
 install-cli: cli
 	$(INSTALL) -d $(DESTDIR)$(bindir)
diff --git a/configure b/configure
index 293d008..e9f526d 100755
--- a/configure
+++ b/configure
@@ -305,7 +305,7 @@ configure_system_override() {
     return $res
 }
 
-rm -f x264_config.h config.h config.mak config.log x264.pc x264.def conftest*
+rm -rf x264_config.h config.h config.mak config.log x264.pc x264.def conftest*
 
 # Construct a path to the specified directory relative to the working directory
 relative_path() {
@@ -540,7 +540,7 @@ host="${host#*-}"
 host_vendor="${host%%-*}"
 host_os="${host#*-}"
 
-trap 'rm -f conftest*' EXIT
+trap 'rm -rf conftest*' EXIT
 
 # test for use of compilers that require specific handling
 cc_base=`basename "$CC"`
-- 
2.10.0