kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-11 07:13:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the detection of modules installed from this build.

Browse Source 
You can now add the path of local module subdirs from the command line with
   make LOCAL_MOD_SUBDIRS= ....




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2007-12-10 04:18:07 +00:00
parent 5490889153
commit 7d85d15cd0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -25,6 +25,9 @@
# #
# $ ASTCFLAGS="-Werror" make # $ 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 ASTTOPDIR # Top level dir, used in subdirs' Makefiles
export ASTERISKVERSION export ASTERISKVERSION
export ASTERISKVERSIONNUM export ASTERISKVERSIONNUM
@@ -266,7 +269,7 @@ endif
# #ifdef BUSYDETECT in main/dsp.c # #ifdef BUSYDETECT in main/dsp.c
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS) 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 OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS) SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install) SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -506,7 +509,7 @@ bininstall: _all
$(SUBDIRS_INSTALL): $(SUBDIRS_INSTALL):
@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) 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))) OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
oldmodcheck: oldmodcheck: