From 6afef51800b54540d0c51bbb61ce325591a472fb Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Wed, 12 Sep 2007 19:43:35 +0000 Subject: [PATCH] corrected ivr app installation git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@443 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/ivr/Makefile.ivr_application | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/ivr/Makefile.ivr_application b/apps/ivr/Makefile.ivr_application index 07f4df5a..e6450bff 100644 --- a/apps/ivr/Makefile.ivr_application +++ b/apps/ivr/Makefile.ivr_application @@ -8,15 +8,14 @@ include $(COREPATH)/../Makefile.defs include $(IVRPATH)/Makefile.defs # -LIB_INSTALLDIR?="/usr/local/lib/sems/ivr" +ivr-modules-dir?=lib/sems/ivr + +LIB_INSTALLDIR?=$(modules-prefix)/$(ivr-modules-dir) TARBALL_PREFIX=sems-app-${NAME} TARBALL="${TARBALL_PREFIX}-${VERSION}.tar.gz" BASEDIR?=${basedir} -GROUP="root" -OWNER="root" - BIN_PERMISSIONS="755" LIB_PERMISSIONS="644" @@ -40,9 +39,9 @@ compile: .PHONY: install install: all install -d ${BASEDIR}/${LIB_INSTALLDIR} - install -m ${LIB_PERMISSIONS} -o ${OWNER} -g ${GROUP} *.pyc ${BASEDIR}/${LIB_INSTALLDIR} + install -m ${LIB_PERMISSIONS} *.pyc ${BASEDIR}/${LIB_INSTALLDIR} install -d ${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} - install -m ${LIB_PERMISSIONS} -o ${OWNER} -g ${GROUP} ${LIBDIR}/*.pyc ${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} + install -m ${LIB_PERMISSIONS} ${LIBDIR}/*.pyc ${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} .PHONY: install-cfg install-cfg: @@ -50,7 +49,10 @@ install-cfg: -@for r in $(module_conf_files); do \ echo installing $$r ; \ $(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)$$r ; \ - $(INSTALL-CFG) $$r $(cfg-prefix)/$(cfg-dir)$$r; \ + sed -e "s#/usr/.*lib/sems/audio/#$(audio-target)#g" \ + -e "s#/usr/.*lib/sems/plug-in/#$(modules-target)#g" \ + -e "s#/usr/.*etc/sems#$(cfg-target)#g" \ + < $$r > $(cfg-prefix)/$(cfg-dir)$$r; \ done