[sr-dev] git:master: xhttp_pi: fix installation of the pi_framework.xml file

Module: sip-router Branch: master Commit: 7a63bbed0ccc1a2a85b26d127e775f832efaa2a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a63bbe… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Dec 4 16:18:12 2012 -0500 xhttp_pi: fix installation of the pi_framework.xml file --- Makefile | 8 -------- modules/xhttp_pi/Makefile | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 08c3245..ee58a21 100644 --- a/Makefile +++ b/Makefile @@ -1000,14 +1000,6 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi ; \ fi ; \ done; true - # provisionning xml framework - $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample - $(INSTALL_CFG) examples/pi_framework.xml \ - $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample - if [ ! -f $(cfg_prefix)/$(cfg_dir)/pi_framework.xml ]; then \ - mv -f $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample \ - $(cfg_prefix)/$(cfg_dir)/pi_framework.xml; \ - fi # radius dictionary $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) diff --git a/modules/xhttp_pi/Makefile b/modules/xhttp_pi/Makefile index d98c979..8982013 100644 --- a/modules/xhttp_pi/Makefile +++ b/modules/xhttp_pi/Makefile @@ -27,3 +27,15 @@ DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules + +install-cfg: + # provisionning xml framework + @$(call try_err, $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample) + @$(call try_err, $(INSTALL_CFG) ../../examples/pi_framework.xml \ + $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample) + @if [ -z "${skip_cfg_install}" -a \ + ! -f $(cfg_prefix)/$(cfg_dir)/pi_framework.xml ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample \ + $(cfg_prefix)/$(cfg_dir)/pi_framework.xml; \ + fi +