diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-15 23:45:03 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-15 23:45:03 +0000 |
| commit | 31986bad926b68dfe6b54041ff23c96b224de05c (patch) | |
| tree | eebbbfeb5df56a9c8286f6ff3a7f1f8e0875bc10 | |
| parent | b2d102a74f3d4b0d419b1360e8eba67c016699f4 (diff) | |
Merged revisions 246710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r246710 | tilghman | 2010-02-15 17:43:28 -0600 (Mon, 15 Feb 2010) | 12 lines
Merged revisions 246709 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r246709 | tilghman | 2010-02-15 17:42:33 -0600 (Mon, 15 Feb 2010) | 5 lines
Make the menuselect instructions correct by allowing 'make menuselect' to actually solve dependency problems.
(Previously, it would fail out again with the same message about running
'make menuselect', which was NOT at all helpful.)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@246713 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -369,8 +369,10 @@ makeopts: configure @exit 1 menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) +ifeq ($(filter %menuselect,$(MAKECMDGOALS)),) menuselect/menuselect --check-deps $@ menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) +endif $(MOD_SUBDIRS_EMBED_LDSCRIPT): +@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules |