[Astlinux-commits] SF.net SVN: astlinux:[6676] branches/1.0/package/kamailio

[<abe...@us...>]

Revision: 6676
          http://sourceforge.net/p/astlinux/code/6676
Author:   abelbeck
Date:     2014-08-28 04:32:04 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
kamailio, set the 'modules' path to: /usr/lib/kamailio/modules/

Modified Paths:
--------------
    branches/1.0/package/kamailio/etc/kamailio-basic.cfg
    branches/1.0/package/kamailio/etc/kamailio.cfg
    branches/1.0/package/kamailio/kamailio.mk

Modified: branches/1.0/package/kamailio/etc/kamailio-basic.cfg
===================================================================
--- branches/1.0/package/kamailio/etc/kamailio-basic.cfg	2014-08-28 03:48:05 UTC (rev 6675)
+++ branches/1.0/package/kamailio/etc/kamailio-basic.cfg	2014-08-28 04:32:04 UTC (rev 6676)
@@ -138,7 +138,7 @@
 #!ifdef WITH_SRCPATH
 mpath="modules_k:modules"
 #!else
-mpath="/lib/kamailio/modules/"
+mpath="/usr/lib/kamailio/modules/"
 #!endif
 
 #!ifdef WITH_SQLITE

Modified: branches/1.0/package/kamailio/etc/kamailio.cfg
===================================================================
--- branches/1.0/package/kamailio/etc/kamailio.cfg	2014-08-28 03:48:05 UTC (rev 6675)
+++ branches/1.0/package/kamailio/etc/kamailio.cfg	2014-08-28 04:32:04 UTC (rev 6676)
@@ -209,7 +209,7 @@
 #!ifdef WITH_SRCPATH
 mpath="modules/"
 #!else
-mpath="/lib/kamailio/modules/"
+mpath="/usr/lib/kamailio/modules/"
 #!endif
 
 #!ifdef WITH_SQLITE

Modified: branches/1.0/package/kamailio/kamailio.mk
===================================================================
--- branches/1.0/package/kamailio/kamailio.mk	2014-08-28 03:48:05 UTC (rev 6675)
+++ branches/1.0/package/kamailio/kamailio.mk	2014-08-28 04:32:04 UTC (rev 6676)
@@ -38,12 +38,12 @@
 	cfg_dir=etc/kamailio/ \
 	data_dir=usr/share/kamailio \
 	lib_dir=usr/lib/kamailio \
-	module_dir=usr/lib/kamailio \
 	cfg_target=/etc/kamailio/ \
 	group_include="$(KAMAILIO_GROUP_MODULES)" \
 	include_modules="$(KAMAILIO_INCLUDE_MODULES)" \
 	exclude_modules="$(KAMAILIO_EXCLUDE_MODULES)" \
 	modules_dirs="modules" \
+	LIBDIR=usr/lib \
 	ARCH="i386" \
 	OS="linux"
 
@@ -86,7 +86,6 @@
 
 define KAMAILIO_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/kamailio
-	rm -rf $(TARGET_DIR)/lib/kamailio
 	rm -rf $(TARGET_DIR)/usr/lib/kamailio
 	rm -rf $(TARGET_DIR)/usr/share/kamailio
 	rm -rf $(TARGET_DIR)/stat/etc/kamailio

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.