From bf756f2be663e76f0717dec5e8671a0537c7a6fe Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 18 Mar 2014 14:58:48 -0400 Subject: [PATCH 1/2] FS-6293: don't blow up on clean on mod_managed (still does not do srcdir right) --- src/mod/languages/mod_managed/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mod/languages/mod_managed/Makefile.am b/src/mod/languages/mod_managed/Makefile.am index 80f5d1b1a3..88cab93336 100644 --- a/src/mod/languages/mod_managed/Makefile.am +++ b/src/mod/languages/mod_managed/Makefile.am @@ -1,5 +1,6 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_managed +MANAGED_DIR=$(switch_srcdir)/src/mod/languages/mod_managed/managed mod_LTLIBRARIES = mod_managed.la mod_managed_la_SOURCES = mod_managed.cpp freeswitch_managed.cpp freeswitch_wrap.cpp @@ -18,18 +19,18 @@ freeswitch_wrap.cpp: freeswitch_wrap.cxx reswig: swigclean freeswitch_wrap.cxx local_depend: - cd managed && $(MAKE) + cd $(MANAGED_DIR) && $(MAKE) install-data-local: $(DESTDIR)$(modulesdir)/mod_managed.$(LIBTOOL_LIB_EXTEN) mkdir -p $(DESTDIR)$(modulesdir)/managed - cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install + cd $(MANAGED_DIR) && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install uninstall: rm -fr $(DESTDIR)$(modulesdir)/mod_managed.so - cd managed && $(MAKE) UNINSTALL="$(LTUNINSTALL)" MODINSTDIR=$(modulesdir) uninstall + cd $(MANAGED_DIR) && $(MAKE) UNINSTALL="$(LTUNINSTALL)" MODINSTDIR=$(modulesdir) uninstall clean: - cd managed && $(MAKE) clean + cd $(MANAGED_DIR) && $(MAKE) clean swigclean: clean rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs From 3a979c67ab05d58ad5dc751103b9b06def83d0b2 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 18 Mar 2014 15:07:39 -0400 Subject: [PATCH 2/2] FS-6293: fix mod_cdr_mongodb srcdir build --- src/mod/event_handlers/mod_cdr_mongodb/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am b/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am index 5552659206..de67985645 100644 --- a/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am +++ b/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_cdr_mongodb -MONGODB_DRIVER=./driver/src +MONGODB_DRIVER=$(switch_srcdir)/src/mod/event_handlers/mod_cdr_mongodb/driver/src mod_LTLIBRARIES = mod_cdr_mongodb.la mod_cdr_mongodb_la_SOURCES = mod_cdr_mongodb.c ./driver/src/encoding.c ./driver/src/env_posix.c ./driver/src/bson.c ./driver/src/md5.c ./driver/src/mongo.c ./driver/src/numbers.c mod_cdr_mongodb_la_CFLAGS = $(AM_CFLAGS)