From: Luigi Rizzo <rizzo@icir.org>
Date: Mon, 10 Dec 2007 04:18:07 +0000 (+0000)
Subject: Fix the detection of modules installed from this build.
X-Git-Tag: 1.6.0-beta1~3^2~479
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d85d15cd0d9b568b79e1ff5df1f285f2ba16d0f;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@92083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index ed1e2382a3..82284d45f9 100644
--- a/Makefile
+++ b/Makefile
@@ -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: