[sr-dev] git:master: Makefile: fixed the option of setting some variables from command line

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: e5dbe686bcbf15ac59ebbcb84f3bb9b17568c030
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5dbe686bcbf15ac59ebbcb84f3bb9b17568c030

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Tue Dec  4 21:59:16 2012 +0100

Makefile: fixed the option of setting some variables from command line

- resulted in mixing names for config files
- issue added in previous commit
- reported by Ovidiu Sas

---

 Makefile.defs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index f74b0a1..77cd7a2 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -127,7 +127,7 @@ $(call	set_if_empty,FLAVOUR,kamailio)
 
 #prefix for various configs and scripts
 #config name/name-prefix for distributed configs
-CFG_NAME=sip-router
+CFG_NAME?=sip-router
 #config name/name-prefix for distributed scripts
 SCR_NAME=sip-router
 #name in source tree
@@ -135,15 +135,15 @@ SRC_NAME=sip-router
 
 ifeq ($(FLAVOUR),sip-router)
 # main binary name
-MAIN_NAME?=ser
+MAIN_NAME=ser
 else ifeq ($(FLAVOUR),ser)
 # main binary name
-MAIN_NAME?=ser
+MAIN_NAME=ser
 else ifeq ($(FLAVOUR),kamailio)
 # main binary name
-MAIN_NAME?=kamailio
+MAIN_NAME=kamailio
 # use kamailio config
-CFG_NAME?=kamailio
+CFG_NAME=kamailio
 # kamailio statistics on
 KMSTATS ?= 1
 # fast malloc statistics on
@@ -152,7 +152,7 @@ FMSTATS ?= 1
 WITHAS ?= 1
 else # unknown:
 # main binary name
-MAIN_NAME?=kamailio
+MAIN_NAME=kamailio
 endif
 
 # what to install