git:master:c3a7a4fc: Makefile: print run dir details in uninstall target - sr-dev

12 Feb 2015

Module: kamailio
Branch: master
Commit: c3a7a4fc929f82fe997cbcc6893bdd2f2679d85f
URL: https://github.com/kamailio/kamailio/commit/c3a7a4fc929f82fe997cbcc6893bdd2f...
Author: Daniel-Constantin Mierla miconda@gmail.com
Committer: Daniel-Constantin Mierla miconda@gmail.com
Date: 2015-02-12T13:40:00+01:00
Makefile: print run dir details in uninstall target
- exporte the runbasedir to config.mak
---
Modified: Makefile
Modified: Makefile.defs
---
Diff:  https://github.com/kamailio/kamailio/commit/c3a7a4fc929f82fe997cbcc6893bdd2f...
Patch: https://github.com/kamailio/kamailio/commit/c3a7a4fc929f82fe997cbcc6893bdd2f...
---

diff --git a/Makefile b/Makefile
index f46e520..2892624 100644
--- a/Makefile
+++ b/Makefile
@@ -795,7 +795,7 @@ install-every-module-doc: $(foreach mods,$(modules_dirs),install-$(mods)-doc)
install-every-module-man: $(foreach mods,$(modules_dirs),install-$(mods)-man)
-install-utils: utils $(bin_prefix)/$(bin_dir)
+install-utils: utils $(bin_prefix)/$(bin_dir) $(run_prefix)/$(run_dir)
    @for r in $(C_INSTALL_BIN) "" ; do \
    	if [ -n "$$r" ]; then \
    		if [ -f "$$r" ]; then \
@@ -1027,6 +1027,7 @@ uninstall:
    @echo " *LIBDIR Path is: ${lib_prefix}/${lib_dir}"
    @echo " *MANDIR Path is: ${man_prefix}/${man_dir}"
    @echo " *SHRDIR Path is: ${share_prefix}/${share_dir}"
+	@echo " *RUNDIR Path is: $(run_prefix)/$(run_dir)"
    @if [ "${PREFIX}" != "/usr/local" ] ; then \
    	echo "-Custom PREFIX Path" ; \
    	if [ "${PREFIX}" = "/" -o "${PREFIX}" = "/usr" ] ; then \
@@ -1057,6 +1058,7 @@ uninstall:
    	echo "rm -rf ${doc_prefix}/${doc_dir}" ; \
    	echo "rm -rf ${lib_prefix}/${lib_dir}" ; \
    	echo "rm -rf ${share_prefix}/${share_dir}" ; \
+		echo "rm -rf $(run_prefix)/$(run_dir)" ; \
    	echo ; \
    	echo "-WARNING: before running the commands, be sure they don't delete any system directory or file" ; \
    fi ;
diff --git a/Makefile.defs b/Makefile.defs
index 37dedcd..545ffea 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -467,7 +467,7 @@ cfg_target = $(prefix)/$(cfg_dir)
 bin_target = $(prefix)/$(bin_dir)
 #modules_target = $(prefix)/$(modules_dir)
 lib_target = $(prefix)/$(lib_dir)
-run_target = $(runbasedir)/$(run_dir)
+run_target = $(run_prefix)/$(run_dir)
 doc_target = $(prefix)/$(doc_dir)
 data_target = $(prefix)/$(data_dir)
@@ -2018,8 +2018,8 @@ saved_fixed_vars:=	MAIN_NAME  CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \
 # extra: prefix DESTDIR BASEDIR basedirt
 saved_chg_vars:=\
    	CC_EXTRA_OPTS CPU CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \
-		BASEDIR basedir DESTDIR LIBDIR \
-		PREFIX prefix\
+		BASEDIR basedir DESTDIR LIBDIR RUNBASEDIR runbasedir \
+		PREFIX prefix \
    	cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \
    	doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \
    	share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \

    