aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-03 00:53:56 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-03 00:53:56 +0000
commita14ce24397822338713f77a06b8599ee69768ab1 (patch)
treec692b3098f09e708f61cd646aa322ff99a20dc6c
parent8df07be5253c602bb2c7e6043e4b4f6043ce1739 (diff)
Fix some 'make menuselect' breakage introduced by recent merges.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160427 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile14
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index aaa5d760b..ce2888c61 100644
--- a/Makefile
+++ b/Makefile
@@ -837,8 +837,18 @@ gmenuconfig: gmenuselect
nmenuconfig: nmenuselect
-menuselect: menuselect/menuselect menuselect-tree
- -@menuselect/menuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
+ @if [ -x menuselect/nmenuselect ]; then \
+ $(MAKE) nmenuselect; \
+ elif [ -x menuselect/cmenuselect ]; then \
+ $(MAKE) cmenuselect; \
+ elif [ -x menuselect/gmenuselect ]; then \
+ $(MAKE) gmenuselect; \
+ else \
+ echo "No menuselect user interface found. Install ncurses,"; \
+ echo "newt or GTK libraries to build one and re-rerun"; \
+ echo "'make menuselect'."; \
+ fi
cmenuselect: menuselect/cmenuselect menuselect-tree
-@menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"