]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Make the menuselect instructions correct by allowing 'make menuselect' to actually...
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 15 Feb 2010 23:42:33 +0000 (23:42 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 15 Feb 2010 23:42:33 +0000 (23:42 +0000)
(Previously, it would fail out again with the same message about running
'make menuselect', which was NOT at all helpful.)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@246709 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index a71d7820af8735caf96d9c74887e72bce420b6bd..7d403dbdb2c785ae6ca35c34b69ebc3e86e0e8ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -323,8 +323,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+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules