diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS
index 0abc2c2ce..3f48c5699 100644
--- a/configure/CONFIG_ADDONS
+++ b/configure/CONFIG_ADDONS
@@ -424,3 +424,19 @@ RCS += $(RCS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(PROD_RCS_$(OS_CLASS))),)
+PROD_RCS += $(subst -nil-,,$(PROD_RCS_$(OS_CLASS)))
+else
+ifdef PROD_RCS_DEFAULT
+PROD_RCS+=$(PROD_RCS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(LIB_RCS_$(OS_CLASS))),)
+LIB_RCS += $(subst -nil-,,$(LIB_RCS_$(OS_CLASS)))
+else
+ifdef LIB_RCS_DEFAULT
+LIB_RCS+=$(LIB_RCS_DEFAULT)
+endif
+endif
+
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index e86ac1acb..35c015ac5 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -156,7 +156,7 @@ TARGET_RESS = $(addsuffix $(RES),$(basename $($*_RCS)))
 PROD_RESS = $(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS)))
 PROD_LD_RESS = $(TARGET_RESS) $(PROD_RESS)
 
-LIBRARY_RESS = $(addsuffix $(RES),$(basename $(RCS) $(LIBRARY_RCS)))
+LIBRARY_RESS = $(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS)))
 LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 
 #--------------------------------------------------
@@ -207,13 +207,11 @@ DEBUG_LDLIBS =
 TARGET_INCLUDES = $($(basename $@)_INCLUDES_$(T_A))
 TARGET_CFLAGS = $($(basename $@)_CFLAGS_$(T_A))
 TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS_$(T_A))
-TARGET_LDFLAGS = $($(basename $@)_LDFLAGS_$(T_A))
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS_$(T_A))
 
 TARGET_INCLUDES += $($(basename $@)_INCLUDES_$(OS_CLASS)) $($(basename $@)_INCLUDES)
 TARGET_CFLAGS += $($(basename $@)_CFLAGS_$(OS_CLASS)) $($(basename $@)_CFLAGS)
 TARGET_CXXFLAGS += $($(basename $@)_CXXFLAGS_$(OS_CLASS)) $($(basename $@)_CXXFLAGS)
-TARGET_LDFLAGS += $($(basename $@)_LDFLAGS_$(OS_CLASS)) $($(basename $@)_LDFLAGS)
 TARGET_CPPFLAGS += $($(basename $@)_CPPFLAGS_$(OS_CLASS)) $($(basename $@)_CPPFLAGS)
 
 # Level of ansi conformance flags