diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk
index 7daec20f..2565c77d 100644
--- a/make/defs-cpp.mk
+++ b/make/defs-cpp.mk
@@ -512,7 +512,7 @@ endif
 BUILD_CFLAGS                += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE)
 BUILD_CPPFLAGS              += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(INCLUDE)
 BUILD_LDFLAGS               += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
-#RPM_REQUIRES                = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
+#RPM_REQUIRES                = $(shell $(ECHO) "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
 RPM_REQUIRES                += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)
 
 # -- LIB
@@ -544,12 +544,12 @@ ifeq ($(USE_PROJECT_LIB),true)
   #       lib-related variables
   LOCAL_LIBS                +=
   ifneq ($(TARGET),mingw)
-    LIB_A                    = $(BUILD_LIBDIR)/lib$(LIBNAME).a
-    SO_SUFFIX                = so.$(MAJOR_MINOR_RELEASE)
+    LIB_A                   ?= $(BUILD_LIBDIR)/lib$(LIBNAME).a
+    SO_SUFFIX               ?= so.$(MAJOR_MINOR_RELEASE)
     SO_PREFIX               ?= lib
-    LIB_SO                   = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
-    LINKS_SO                += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
-    INSTALLED_LINKS_SO      += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
+    LIB_SO                  ?= $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
+    LINKS_SO                += $(filter-out $(LIB_SO),$(shell $(ECHO) $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/"))
+    INSTALLED_LINKS_SO      += $(filter-out $(INSTALLED_LIB_SO),$(shell $(ECHO) $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/"))
     INSTALLED_LIB_A          = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
   else
     LIB_A                    = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
@@ -557,11 +557,11 @@ ifeq ($(USE_PROJECT_LIB),true)
     WINRES_RC_TMPL           = $(MODDIR)/make/winres.rc.tmpl
     WINRES_RC                = $(BUILD_LIBDIR)/$(PROJECT).rc
     WINRES_O                 = $(WINRES_RC).o
-    SO_SUFFIX                = dll
+    SO_SUFFIX               ?= dll
     SO_PREFIX               ?=
     LIB_DEF                  = $(BUILD_LIBDIR)/$(LIBNAME).def
     MSVCPP_IMPLIB            = $(BUILD_LIBDIR)/$(LIBNAME).lib
-    LIB_SO                   = $(BUILD_LIBDIR)/$(LIBNAME).dll
+    LIB_SO                  ?= $(BUILD_LIBDIR)/$(LIBNAME).dll
     INSTALLED_LIB_A          = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
   endif # mingw
   BUILD_LIB                 += $(LIB_SO)