- default to /var/run/kamailio
- obeys the PREFIX, becomeing $(PREFIX)/var/run/kamailio
- based on GH issue #80
... | ... |
@@ -663,7 +663,7 @@ man: $(foreach mods,$(modules_dirs),$(mods)-man) |
663 | 663 |
mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \ |
664 | 664 |
$(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \ |
665 | 665 |
$(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 \ |
666 |
- $(share_prefix)/$(share_dir) \ |
|
666 |
+ $(share_prefix)/$(share_dir) $(run_prefix)/$(run_dir) \ |
|
667 | 667 |
$(foreach mods,$(modules_dirs),\ |
668 | 668 |
$(modules_prefix)/$(modules_dir)$(mods) \ |
669 | 669 |
$(doc_prefix)/$(doc_dir)$(mods) ) |
... | ... |
@@ -671,6 +671,9 @@ mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \ |
671 | 671 |
$(cfg_prefix)/$(cfg_dir): |
672 | 672 |
mkdir -p $(cfg_prefix)/$(cfg_dir) |
673 | 673 |
|
674 |
+$(run_prefix)/$(run_dir): |
|
675 |
+ mkdir -p $(run_prefix)/$(run_dir) |
|
676 |
+ |
|
674 | 677 |
$(bin_prefix)/$(bin_dir): |
675 | 678 |
mkdir -p $(bin_prefix)/$(bin_dir) |
676 | 679 |
|
... | ... |
@@ -377,7 +377,7 @@ share_dir = share/$(MAIN_NAME)/ |
377 | 377 |
# lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k |
378 | 378 |
modules_dir = $(LIBDIR)/$(MAIN_NAME)/ |
379 | 379 |
lib_dir = $(LIBDIR)/$(MAIN_NAME)/ |
380 |
- |
|
380 |
+run_dir = var/run/$(MAIN_NAME)/ |
|
381 | 381 |
doc_dir = doc/$(MAIN_NAME)/ |
382 | 382 |
man_dir = man/ |
383 | 383 |
data_dir = $(MAIN_NAME)/ |
... | ... |
@@ -429,6 +429,17 @@ LOCALBASE ?= /usr/local |
429 | 429 |
# Doxygen directory |
430 | 430 |
doxygen_dir=doc/doxygen |
431 | 431 |
|
432 |
+BASEDIR ?= $(DESTDIR) |
|
433 |
+basedir = $(BASEDIR) |
|
434 |
+ |
|
435 |
+ifeq ($(BASEDIR),) |
|
436 |
+RUNBASEDIR ?= $(PREFIX) |
|
437 |
+else |
|
438 |
+RUNBASEDIR ?= $(BASEDIR)/$(PREFIX) |
|
439 |
+endif |
|
440 |
+ |
|
441 |
+runbasedir = $(RUNBASEDIR) |
|
442 |
+ |
|
432 | 443 |
# install location |
433 | 444 |
PREFIX ?= $(LOCALBASE) |
434 | 445 |
prefix = $(PREFIX) |
... | ... |
@@ -438,13 +449,12 @@ prefix = $(PREFIX) |
438 | 449 |
# basedir=/tmp |
439 | 450 |
# prefix=/usr/local |
440 | 451 |
|
441 |
-BASEDIR ?= $(DESTDIR) |
|
442 |
-basedir = $(BASEDIR) |
|
443 | 452 |
# install prefixes for various stuff |
444 | 453 |
cfg_prefix = $(basedir)$(prefix) |
445 | 454 |
bin_prefix = $(basedir)$(prefix) |
446 | 455 |
modules_prefix = $(basedir)$(prefix) |
447 | 456 |
lib_prefix = $(basedir)$(prefix) |
457 |
+run_prefix = $(runbasedir) |
|
448 | 458 |
doc_prefix = $(basedir)$(prefix) |
449 | 459 |
man_prefix = $(basedir)$(prefix) |
450 | 460 |
ut_prefix = $(basedir)$(prefix) |
... | ... |
@@ -457,6 +467,7 @@ cfg_target = $(prefix)/$(cfg_dir) |
457 | 467 |
bin_target = $(prefix)/$(bin_dir) |
458 | 468 |
#modules_target = $(prefix)/$(modules_dir) |
459 | 469 |
lib_target = $(prefix)/$(lib_dir) |
470 |
+run_target = $(runbasedir)/$(run_dir) |
|
460 | 471 |
doc_target = $(prefix)/$(doc_dir) |
461 | 472 |
data_target = $(prefix)/$(data_dir) |
462 | 473 |
|
... | ... |
@@ -613,6 +624,7 @@ C_DEFS= $(extra_defs) \ |
613 | 624 |
-D__CPU_$(ARCH) $(os_defs) \ |
614 | 625 |
-DSER_VER=$(SER_VER) \ |
615 | 626 |
-DCFG_DIR='"$(cfg_target)"'\ |
627 |
+ -DRUN_DIR='"$(run_target)"'\ |
|
616 | 628 |
-DPKG_MALLOC \ |
617 | 629 |
-DSHM_MEM -DSHM_MMAP \ |
618 | 630 |
-DDNS_IP_HACK \ |
... | ... |
@@ -2011,7 +2023,7 @@ saved_chg_vars:=\ |
2011 | 2023 |
cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ |
2012 | 2024 |
doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ |
2013 | 2025 |
share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \ |
2014 |
- cfg_target lib_target data_target |
|
2026 |
+ cfg_target lib_target data_target run_prefix run_dir run_target |
|
2015 | 2027 |
|
2016 | 2028 |
|
2017 | 2029 |
#export relevant variables to the sub-makes |