--- configure
+++ configure
@@ -2210,13 +2210,8 @@
 fi
 
 
-if test "$enable_debug" = yes ; then
-  CONFIG_FILE="bird$SUFFIX.conf"
-  CONTROL_SOCKET="bird$SUFFIX.ctl"
-else
   CONFIG_FILE="\$(sysconfdir)/bird$SUFFIX.conf"
   CONTROL_SOCKET="$runtimedir/bird$SUFFIX.ctl"
-fi