Module: sems Branch: master Commit: 8f289e98b9b37b494faa47717d942982e25a96a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=8f289e98b9b37b494faa47717d942982e25a96a1
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Wed Sep 22 14:25:19 2010 +0200 reverted app config dir to /etc/sems/etc For users upgrading from earlier versions, changing the path without any advantage would just create confusion. Also, /etc/sems is cluttered with lots of files if all app configurations are saved there. --- Makefile.defs | 7 ++++++- core/plug-in/Makefile.app_module | 12 +++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 73538f3..b59c545 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -310,6 +310,7 @@ endif # target dirs for various stuff bin-target = $(prefix)/$(bin-dir) cfg-target = $(prefix)/$(cfg-dir) +app-cfg-target = $(prefix)/$(cfg-dir)etc/ modules-target = $(prefix)/$(modules-dir) audio-target = $(prefix)/$(audio-dir) lib-target = $(prefix)/$(lib-dir) @@ -339,7 +340,7 @@ export DESTDIR PREFIX prefix basedir ser-prefix export start-script export cfg-prefix bin-prefix modules-prefix doc-prefix audio-prefix lib-prefix export cfg-dir bin-dir modules-dir audio-dir lib-dir doc-dir man-dir -export bin-target cfg-target modules-target audio-target lib-target +export bin-target cfg-target app-cfg-target modules-target audio-target lib-target export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR @@ -350,6 +351,7 @@ export exclude_core_modules exclude_app_modules endif # ifeq ($(makefile_defs, 1) mk-install-dirs: $(DESTDIR)$(cfg-target) \ + $(DESTDIR)$(app-cfg-target) \ $(DESTDIR)$(bin-prefix)/$(bin-dir) \ $(DESTDIR)$(modules-prefix)/$(modules-dir) \ $(DESTDIR)$(audio-prefix)/$(audio-dir) \ @@ -358,6 +360,9 @@ mk-install-dirs: $(DESTDIR)$(cfg-target) \ $(DESTDIR)$(cfg-target): mkdir -p $(DESTDIR)$(cfg-target) +$(DESTDIR)$(app-cfg-target): + mkdir -p $(DESTDIR)$(app-cfg-target) + $(DESTDIR)$(bin-prefix)/$(bin-dir): mkdir -p $(DESTDIR)$(bin-prefix)/$(bin-dir) diff --git a/core/plug-in/Makefile.app_module b/core/plug-in/Makefile.app_module index d7490fc..ad8587d 100644 --- a/core/plug-in/Makefile.app_module +++ b/core/plug-in/Makefile.app_module @@ -44,26 +44,24 @@ clean: $(extra_clean) deps: $(depends) $(extra_depends) .PHONY: install -install: all $(extra_install) - mkdir -p $(DESTDIR)$(modules-prefix)/$(modules-dir) +install: all $(extra_install) $(DESTDIR)$(modules-prefix)/$(modules-dir) if [ -f "$(lib_name)" ]; then \ $(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$(lib_name) ; \ $(INSTALL-MODULES) $(lib_name) $(DESTDIR)$(modules-prefix)/$(modules-dir); \ fi .PHONY: install-cfg -install-cfg: - mkdir -p $(DESTDIR)$(cfg-target) +install-cfg: $(DESTDIR)$(app-cfg-target) -...@for r in $(module_conf_files); do \ echo installing $$r ; \ - $(INSTALL-TOUCH) $(DESTDIR)$(cfg-target)$$r ; \ + $(INSTALL-TOUCH) $(DESTDIR)$(app-cfg-target)$$r ; \ sed -e "s#/usr/.*lib/sems/audio/#$(audio-target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules-target)#g" \ -e "s#/usr/.*lib/sems/ivr/#$(lib-target)ivr/#g" \ -e "s#/usr/.*lib/sems/dsm/#$(lib-target)dsm/#g" \ -e "s#/usr/.*lib/sems/py_sems/#$(lib-target)py_sems/#g" \ - -e "s#/usr/.*etc/sems#$(cfg-target)#g" \ - < etc/$$r > $(DESTDIR)$(cfg-target)$$r; \ + -e "s#/usr/.*etc/sems#$(app-cfg-target)#g" \ + < etc/$$r > $(DESTDIR)$(app-cfg-target)$$r; \ done $(DESTDIR)(audio-prefix)/$(audio-dir): _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
