[sr-dev] git:master: makefile: MAIN_NAME reverted

[Edson - Lists]

Andrei Pelinescu-Onciul escreveu:
> On Jun 24, 2009 at 19:17, Edson - Lists <4lists at gmail.com> wrote:
>> Andrei Pelinescu-Onciul escreveu:
>>> Module: sip-router
>>> Branch: master
>>> Commit: 5c00f5c2987b9cbdae7734db89019f6ef1d3f815
>>> URL:    
>>> http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c00f5c2987b9cbdae7734db89019f6ef1d3f815
>>>
>>> Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
>>> Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
>>> Date:   Wed Jun 24 23:55:16 2009 +0200
>>>
>>> makefile: MAIN_NAME reverted
>>>
>>> MAIN_NAME reverted to ser (should be changed _only_ when we agree
>>> on the short name).
>>>
>>> ---
>> Just used "git pull", try to compile and got:
>>
>> config.mak loaded
>> Makefile.defs defs skipped
>> bison -d -b cfg cfg.y
>> cfg.y: conflicts: 4 shift/reduce
>> flex cfg.lex
>> main.c:179:21: error: autover.h: No such file or directory
>> core_cmd.c:31:21: error: autover.h: No such file or directory
>> config.mak loaded
>>
>> Compilation doesn't stop, but the error shouldn't show...
> 
> Thanks, it should be fixed now.
> 
The autover.h issue is gone... thanks...

But on the compilation process I notice that "name" and "cfg_dir" aren't 
reflecting command line. I compiled with:
    make LOCALBASE=/ MAIN_NAME="sip-router" prefix=/ man_prefix=/usr

and got this output:

include_modules="db_mysql siptrace carrierroute" modules install 
             config.mak loaded
Makefile.defs defs skipped
bison -d -b cfg cfg.y
cfg.y: conflicts: 4 shift/reduce
flex cfg.lex
generating autover.h ...
config.mak loaded
Makefile.defs defs skipped


config.mak included
make[1]: Entering directory `/root/sr/sip-router/modules/db_mysql'
make[1]: Leaving directory `/root/sr/sip-router/modules/db_mysql'
config.mak included
make[1]: Entering directory `/root/sr/sip-router/modules/db_mysql'
gcc -fPIC -DPIC -g -O9 -funroll-loops -Wcast-align 
-minline-all-stringops -falign-loops -ftree-vectorize -mtune=i686 -Wall 
    -DNAME='"ser"' -DVERSION='"2.99.0-dev01-serk"' -DARCH='"i386"' 
-DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.3.2"' 
-D__CPU_i386 -D__OS_linux -DSER_VER=2099000 -DCFG_DIR='"//etc/ser/"' 
-DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST 
-DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE 
-DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DDBG_QM_MALLOC 
-DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT 
-DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 
-DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL 
-DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM 
-DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT 
-DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT   -DSER_MOD_INTERFACE 
-I//include -I//include/mysql -I//mysql/include -I/usr/include/mysql 
-DMOD_NAME='"db_mysql"' -c km_db_mysql.c -o km_db_mysql.o

Notice that -DNAME='"ser"' and -DCFG_DIR='"//etc/ser"'. I understand 
that they should be -DNAME='"sip-router"' and 
-DCFG_DIR='"//etc/sip-router/"', respectively, or am I wrong?

Edson.