diff options
Diffstat (limited to 'net/kamailio/files')
| -rw-r--r-- | net/kamailio/files/kamailio.in | 4 | ||||
| -rw-r--r-- | net/kamailio/files/patch-src_Makefile.defs | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/net/kamailio/files/kamailio.in b/net/kamailio/files/kamailio.in index e069a771d4fd..7fbbeab8fbad 100644 --- a/net/kamailio/files/kamailio.in +++ b/net/kamailio/files/kamailio.in @@ -48,7 +48,9 @@ extra_commands="configtest" kamailio_start_precmd() { - install -d -m 0750 -o ${kamailio_user} -g ${kamailio_group} "%%KAMAILIO_RUNDIR%%" + if [ ! -d "%%KAMAILIO_RUNDIR%%" ]; then + install -d -m 0750 -o ${kamailio_user} -g ${kamailio_group} "%%KAMAILIO_RUNDIR%%" + fi } kamailio_checkconfig() diff --git a/net/kamailio/files/patch-src_Makefile.defs b/net/kamailio/files/patch-src_Makefile.defs index 218c8af3ca7d..0ae9cb50204f 100644 --- a/net/kamailio/files/patch-src_Makefile.defs +++ b/net/kamailio/files/patch-src_Makefile.defs @@ -1,6 +1,6 @@ ---- src/Makefile.defs.orig 2019-10-17 11:30:50 UTC +--- src/Makefile.defs.orig 2020-05-06 13:20:45 UTC +++ src/Makefile.defs -@@ -245,7 +245,7 @@ YACC := $(shell echo "$${YACC}") +@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}") # find compiler name & version ifeq ($(CC),) @@ -9,7 +9,7 @@ endif LD= $(CC) CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \ -@@ -259,7 +259,7 @@ MKTAGS=ctags +@@ -271,7 +271,7 @@ MKTAGS=ctags #find-out the compiler's name ifneq (,$(findstring gcc, $(CC_LONGVER))) @@ -18,7 +18,7 @@ RPAREN=) CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\ sed -e 's/([^$(RPAREN)]*)//g' \ -@@ -444,7 +444,7 @@ LIBDIR ?= +@@ -456,7 +456,7 @@ LIBDIR ?= ifeq ($(LIBDIR),) ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') ifeq ($(ARCHBSZ),64b) @@ -27,7 +27,7 @@ else LIBDIR = lib endif -@@ -1818,7 +1818,7 @@ ifeq ($(YACC),) +@@ -1830,7 +1830,7 @@ ifeq ($(YACC),) endif YACC_FLAGS=-d -b core/cfg # on solaris add -lxnet (e.g. LIBS= -lxnet) |