Browse code
Makefile: define RUN_DIR at compile time
- default to /var/run/kamailio
- obeys the PREFIX, becomeing $(PREFIX)/var/run/kamailio
- based on GH issue #80
Daniel-Constantin Mierla authored on 12/02/2015 12:02:07Showing 2 changed files
| ... | ... |
@@ -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 | 438 |
# basedir=/tmp |
| 439 | 439 |
# prefix=/usr/local |
| 440 | 440 |
|
| 441 |
-BASEDIR ?= $(DESTDIR) |
|
| 442 |
-basedir = $(BASEDIR) |
|
| 443 | 441 |
# install prefixes for various stuff |
| 444 | 442 |
cfg_prefix = $(basedir)$(prefix) |
| 445 | 443 |
bin_prefix = $(basedir)$(prefix) |
| 446 | 444 |
modules_prefix = $(basedir)$(prefix) |
| 447 | 445 |
lib_prefix = $(basedir)$(prefix) |
| 446 |
+run_prefix = $(runbasedir) |
|
| 448 | 447 |
doc_prefix = $(basedir)$(prefix) |
| 449 | 448 |
man_prefix = $(basedir)$(prefix) |
| 450 | 449 |
ut_prefix = $(basedir)$(prefix) |
| ... | ... |
@@ -457,6 +467,7 @@ cfg_target = $(prefix)/$(cfg_dir) |
| 457 | 457 |
bin_target = $(prefix)/$(bin_dir) |
| 458 | 458 |
#modules_target = $(prefix)/$(modules_dir) |
| 459 | 459 |
lib_target = $(prefix)/$(lib_dir) |
| 460 |
+run_target = $(runbasedir)/$(run_dir) |
|
| 460 | 461 |
doc_target = $(prefix)/$(doc_dir) |
| 461 | 462 |
data_target = $(prefix)/$(data_dir) |
| 462 | 463 |
|
| ... | ... |
@@ -613,6 +624,7 @@ C_DEFS= $(extra_defs) \ |
| 613 | 613 |
-D__CPU_$(ARCH) $(os_defs) \ |
| 614 | 614 |
-DSER_VER=$(SER_VER) \ |
| 615 | 615 |
-DCFG_DIR='"$(cfg_target)"'\ |
| 616 |
+ -DRUN_DIR='"$(run_target)"'\ |
|
| 616 | 617 |
-DPKG_MALLOC \ |
| 617 | 618 |
-DSHM_MEM -DSHM_MMAP \ |
| 618 | 619 |
-DDNS_IP_HACK \ |
| ... | ... |
@@ -2011,7 +2023,7 @@ saved_chg_vars:=\ |
| 2011 | 2011 |
cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ |
| 2012 | 2012 |
doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ |
| 2013 | 2013 |
share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \ |
| 2014 |
- cfg_target lib_target data_target |
|
| 2014 |
+ cfg_target lib_target data_target run_prefix run_dir run_target |
|
| 2015 | 2015 |
|
| 2016 | 2016 |
|
| 2017 | 2017 |
#export relevant variables to the sub-makes |