[sr-dev] git:master: Makefile: default FLAVOUR set to kamailio

[Ovidiu Sas]

It seems that this commit breaks the install of dictionary.kamailio file.
It is installed as dictionary.sip-router

-ovidiu

On Tue, Dec 4, 2012 at 4:49 AM, Daniel-Constantin Mierla
<miconda at gmail.com> wrote:
> Module: sip-router
> Branch: master
> Commit: 4af2262b88918c316ee3bb9b45a716504f2f8db4
> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4af2262b88918c316ee3bb9b45a716504f2f8db4
>
> Author: Daniel-Constantin Mierla <miconda at gmail.com>
> Committer: Daniel-Constantin Mierla <miconda at gmail.com>
> Date:   Tue Dec  4 10:28:03 2012 +0100
>
> Makefile: default FLAVOUR set to kamailio
>
> - switching to the flavour with packages and docs
>
> ---
>
>  Makefile.defs |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/Makefile.defs b/Makefile.defs
> index c4aab26..bc21034 100644
> --- a/Makefile.defs
> +++ b/Makefile.defs
> @@ -123,7 +123,7 @@ endif # verbose
>  set_if_empty=$(if $($(1)),,$(eval override $(1)=$(2)))
>
>  # flavour: sip-router, ser or kamailio
> -$(call set_if_empty,FLAVOUR,sip-router)
> +$(call set_if_empty,FLAVOUR,kamailio)
>
>  #prefix for various configs and scripts
>  #config name/name-prefix for distributed configs
> @@ -135,24 +135,24 @@ 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
>  FMSTATS ?= 1
>  # application server support on
>  WITHAS ?= 1
> -else # default:
> +else # unknown:
>  # main binary name
> -MAIN_NAME=sip-router
> +MAIN_NAME?=kamailio
>  endif
>
>  # what to install