Module: sems
Branch: master
Commit: a3b79747407bb3b168780ba834e6562c9f5f6689
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=a3b79747407bb3b168780ba834e6562c9f5f6689
Author: debian <deb...@debian.(none)>
Committer: debian <deb...@debian.(none)>
Date: Sat Sep 25 21:44:14 2010 -0400
restoring some more app-cfg-target
---
apps/ivr/Makefile.ivr_application | 8 ++++----
core/Makefile | 6 ++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/apps/ivr/Makefile.ivr_application
b/apps/ivr/Makefile.ivr_application
index 70f111e..aff01fa 100644
--- a/apps/ivr/Makefile.ivr_application
+++ b/apps/ivr/Makefile.ivr_application
@@ -50,14 +50,14 @@ endif
.PHONY: install-cfg
install-cfg:
- mkdir -p $(DESTDIR)$(cfg-target)
+ mkdir -p $(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/.*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):
diff --git a/core/Makefile b/core/Makefile
index c8cf51b..aa7d9a8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -77,7 +77,7 @@ install: all mk-install-dirs \
# note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
-install-cfg: $(DESTDIR)$(cfg-target)
+install-cfg: $(DESTDIR)$(cfg-target) $(DESTDIR)$(app-cfg-target)
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" \
@@ -88,9 +88,7 @@ install-cfg: $(DESTDIR)$(cfg-target)
$(DESTDIR)$(cfg-target)sems.conf; \
fi
-# Make sure the destination exists and is a directory!
- mkdir -p $(DESTDIR)$(cfg-target)
- $(INSTALL-CFG) etc/app_mapping.conf $(DESTDIR)$(cfg-target)
+ $(INSTALL-CFG) etc/app_mapping.conf $(DESTDIR)$(app-cfg-target)
install-bin: $(DESTDIR)$(bin-prefix)/$(bin-dir)
$(INSTALL-TOUCH) $(DESTDIR)$(bin-prefix)/$(bin-dir)$(NAME)
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev
