Module: sip-router Branch: kamailio_3.0 Commit: bf31febc3f17d085dbdd78df12ac6bb01c308744 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf31feb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 4 17:39:46 2009 +0100 sercmd: fix LIBS when installing from a module Don't rely on LIBS having a valid value, since we might get called from a module Makefile. Use needed libs in function of $(OS). (cherry picked from commit b0f00c3348b9c1429f6df5b39dcbd1ca939e9dfc) --- utils/sercmd/Makefile | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index 4ed85f4..fbf616d 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -24,7 +24,15 @@ endif #ifneq (,$(MAKECMDGOALS)) C_DEFS:= DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ $(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS)) -LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) + +# use proper libs (we can't rely on LIBS value since we might be called +# from a module Makefile) +#LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) + +LIBS:= -lresolv +ifeq ($(OS), solaris) + LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl +endif ifeq ($(use_readline),) readline_path := $(shell \