small improvement :-)

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

diff --git a/ChangeLog b/ChangeLog
index e99fc65..93cd9f8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 2005-11-16  Kevin P. Fleming  <kpfleming@digium.com>
 
+       * res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make'
+
        * apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763)
 
        * channel.c (ast_queue_hangup): ensure that the channel lock is held before changing its fields... (issue #5770)

diff --git a/res/Makefile b/res/Makefile
index 56cd802..a324652 100755 (executable)
--- a/res/Makefile
+++ b/res/Makefile
@@ -76,6 +76,17 @@ install: all
        rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
        rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
        for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+       @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \
+         if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \
+                       echo "*************************************************************";\
+                       echo "*** You have the WRONG version of mpg123... you need .59r ***";\
+                       echo "*** Use 'make mpg123' to get the right verison            ***";\
+                       echo "*************************************************************";\
+         fi ;\
+       else \
+               echo "*** You don't have mpg123 installed. You may need ***";\
+               echo "***       it if you want to use MusicOnHold       ***";\
+       fi
 
 res_crypto.so: res_crypto.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
@@ -105,17 +116,6 @@ endif
 depend: .depend
 
 .depend:
-       @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \
-         if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \
-                       echo "*************************************************************";\
-                       echo "*** You have the WRONG version of mpg123... you need .59r ***";\
-                       echo "*** Use 'make mpg123' to get the right verison            ***";\
-                       echo "*************************************************************";\
-         fi ;\
-       else \
-               echo "*** You don't have mpg123 installed. You're going to need ***";\
-               echo "***       it if you want MusicOnHold                      ***";\
-       fi
        ../build_tools/mkdep $(CFLAGS) `ls *.c` 
 
 env: