[x264-devel] Recursively delete conftest files

[Vittorio Giovara]

x264 | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Jan 30 22:14:59 2017 +0100| [a2d2621cc5741414b1f1adfbc08f19f1cc763847] | committer: Henrik Gramner

Recursively delete conftest files

On OS X, one of the conftest files might be a directory named `conftest.dSYM`.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=a2d2621cc5741414b1f1adfbc08f19f1cc763847
---

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

diff --git a/Makefile b/Makefile
index d0b16338..81bce652 100644
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,8 @@ 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 -f config.mak x264_config.h config.h config.log x264.pc x264.def
+	rm -rf conftest*
 
 install-cli: cli
 	$(INSTALL) -d $(DESTDIR)$(bindir)
diff --git a/configure b/configure
index b87a818c..9f3ea11d 100755
--- a/configure
+++ b/configure
@@ -305,7 +305,8 @@ configure_system_override() {
     return $res
 }
 
-rm -f x264_config.h config.h config.mak config.log x264.pc x264.def conftest*
+rm -f x264_config.h config.h config.mak config.log x264.pc x264.def
+rm -rf conftest*
 
 # Construct a path to the specified directory relative to the working directory
 relative_path() {
@@ -540,7 +541,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"`