[sr-dev] git:master:d323d0cf: Makefile: runbasedir should not use PREFIX.

Module: kamailio Branch: master Commit: d323d0cfdf3d100bd14fa01f631e2d65ed1ede95 URL: https://github.com/kamailio/kamailio/commit/d323d0cfdf3d100bd14fa01f631e2d6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-16T14:37:50+02:00 Makefile: runbasedir should not use PREFIX. kamcmd: add missing new RUN_DIR definition --- Modified: Makefile.defs Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d323d0cfdf3d100bd14fa01f631e2d6… Patch: https://github.com/kamailio/kamailio/commit/d323d0cfdf3d100bd14fa01f631e2d6… --- diff --git a/Makefile.defs b/Makefile.defs index 943da47..fb5e41c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -431,14 +431,7 @@ doxygen_dir=doc/doxygen BASEDIR ?= $(DESTDIR) basedir = $(BASEDIR) - -ifeq ($(BASEDIR),) -RUNBASEDIR ?= $(PREFIX) -else -RUNBASEDIR ?= $(BASEDIR)/$(PREFIX) -endif - -runbasedir = $(RUNBASEDIR) +runbasedir = $(BASEDIR) # install location PREFIX ?= $(LOCALBASE) diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index cd3c5d3..60fe5e3 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -28,6 +28,7 @@ endif #ifneq (,$(MAKECMDGOALS)) # erase common DEFS (not needed) C_DEFS:= DEFS:= -DNAME='"$(NAME)"' -DSRNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -D__OS_$(OS) \ + -DRUN_DIR='"$(run_target)"' \ $(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS)) # use proper libs (we can't rely on LIBS value since we might be called