[FFmpeg-cvslog] Merge commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat May 20 16:50:28 2017 +0200| [a8ad127a63ab6348050bfade358facae68f39a2a] | committer: Clément Bœsch

Merge commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc'

* commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc':
  configure: Clean up temporary files on interrupt

Merged-by: Clément Bœsch <u at pkh.me>

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

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index aa89d2d1d8..e6aba0d88d 100755
--- a/configure
+++ b/configure
@@ -3788,6 +3788,7 @@ tmpfile(){
 }
 
 trap 'rm -rf -- "$FFTMPDIR"' EXIT
+trap 'exit 2' INT
 
 tmpfile TMPASM .asm
 tmpfile TMPC   .c


======================================================================

diff --cc configure
index aa89d2d1d8,9c277fa3c2..e6aba0d88d
--- a/configure
+++ b/configure
@@@ -3787,7 -2975,8 +3787,8 @@@ tmpfile()
      eval $1=$tmp
  }
  
 -trap 'rm -rf -- "$AVTMPDIR"' EXIT
 +trap 'rm -rf -- "$FFTMPDIR"' EXIT
+ trap 'exit 2' INT
  
  tmpfile TMPASM .asm
  tmpfile TMPC   .c