[svn-commits] russell: branch 1.6.0 r108352 - in /branches/1.6.0: ./ main/editline/Makefile.in

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Mar 12 17:52:07 2008
New Revision: 108352

URL: http://svn.digium.com/view/asterisk?view=rev&rev=108352
Log:
Merged revisions 106843 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r106843 | qwell | 2008-03-07 16:15:20 -0600 (Fri, 07 Mar 2008) | 13 lines

Merged revisions 106842 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106842 | qwell | 2008-03-07 16:14:45 -0600 (Fri, 07 Mar 2008) | 5 lines

Fix hardcoded grep in editline, were GNU grep is required.

(closes issue #12124)
Reported by: dmartin

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/editline/Makefile.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/editline/Makefile.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/editline/Makefile.in?view=diff&rev=108352&r1=108351&r2=108352
==============================================================================
--- branches/1.6.0/main/editline/Makefile.in (original)
+++ branches/1.6.0/main/editline/Makefile.in Wed Mar 12 17:52:07 2008
@@ -4,7 +4,7 @@
 
 OSTYPE=$(shell uname -s)
 define cyg_subst_sys
-	if uname -s | grep -qi cygwin; then \
+	if uname -s | ${GREP} -qi cygwin; then \
 	cat $@ | sed -e s/"sys\.h"/"config.h"/g > $@.copy; \
 	mv --force $@.copy $@; \
 	fi