diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-10 04:18:07 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-10 04:18:07 +0000 |
| commit | cce381675e8203f496774eab758e4b0b115aa9e6 (patch) | |
| tree | f382c429aeb00521468c31408d46cb513dfe785a | |
| parent | aa855407636dfbcb68119ac54a669ee083fd109b (diff) | |
Fix the detection of modules installed from this build.
You can now add the path of local module subdirs from the command line with
make LOCAL_MOD_SUBDIRS= ....
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92083 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -25,6 +25,9 @@ # # $ ASTCFLAGS="-Werror" make +# You can add the path of local module subdirs from the command line with +# make LOCAL_MOD_SUBDIRS= .... + export ASTTOPDIR # Top level dir, used in subdirs' Makefiles export ASTERISKVERSION export ASTERISKVERSIONNUM @@ -266,7 +269,7 @@ endif # #ifdef BUSYDETECT in main/dsp.c ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS) -MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res +MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res $(LOCAL_MOD_SUBDIRS) OTHER_SUBDIRS:=utils agi SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS) SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install) @@ -506,7 +509,7 @@ bininstall: _all $(SUBDIRS_INSTALL): @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) install -NEWMODS=$(notdir $(wildcard */*.so)) +NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so))) OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so))) oldmodcheck: |