diff --git a/configure b/configure
index 5074d701cf23145a8042734bfce29b573313914e..74e987cae31931d504725e4e9b31db87243b7553 100755
--- a/configure
+++ b/configure
@@ -984,10 +984,12 @@ fi
 #
 ### echo %%% Some clean up
 #
-trap "rm -f Makefile.tmp config.tmp root-config.tmp rootrc.tmp \
-      rootauthrc.tmp rootdaemonrc.tmp memprobe.tmp rootd.tmp \
-      proofd.tmp rootd.xinetd.tmp proofd.xinetd.tmp conftest.mk \
-      conftest.c conftest; exit 1" 1 2 3 15
+trapcmd="rm -f Makefile.tmp config.tmp root-config.tmp rootrc.tmp \
+         rootauthrc.tmp rootdaemonrc.tmp memprobe.tmp rootd.tmp \
+         proofd.tmp rootd.xinetd.tmp proofd.xinetd.tmp conftest.mk \
+         conftest.c conftest"
+trap "$trapcmd; exit 1" 1 2 3 15
+trap "$trapcmd" 0
 
 ######################################################################
 #