diff --git a/Makefile b/Makefile
index f86377ec..5f87207d 100644
--- a/Makefile
+++ b/Makefile
@@ -531,6 +531,8 @@ build-only-$(1)_$(3): TARGET = $(3)
 build-only-$(1)_$(3): BUILD_$(if $(findstring shared,$(3)),SHARED,STATIC) = TRUE
 build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a)
 build-only-$(1)_$(3): BITS = $(if $(findstring x86_64,$(3)),64,32)
+build-only-$(1)_$(3): BUILD_TYPE = $(if $(findstring debug,$(3) $($(1)_CONFIGURE_OPTS)),debug,release)
+build-only-$(1)_$(3): BUILD_TYPE_SUFFIX = $(if $(findstring debug,$(3) $($(1)_CONFIGURE_OPTS)),d)
 build-only-$(1)_$(3): SOURCE_DIR = $(2)/$($(1)_SUBDIR)
 build-only-$(1)_$(3): BUILD_DIR  = $(2)/$($(1)_SUBDIR).build_
 build-only-$(1)_$(3): TEST_FILE  = $($(1)_TEST_FILE)