[svn-commits] russell: branch 1.2 r60012 - /branches/1.2/mkpkgconfig

svn-commits at lists.digium.com svn-commits at lists.digium.com
Tue Apr 3 15:54:50 MST 2007


Author: russell
Date: Tue Apr  3 17:54:49 2007
New Revision: 60012

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60012
Log:
On Darwin, the -r argument to sed is not valid.  It has to be -E.
(issue #9399, reported by jcovert)

Modified:
    branches/1.2/mkpkgconfig

Modified: branches/1.2/mkpkgconfig
URL: http://svn.digium.com/view/asterisk/branches/1.2/mkpkgconfig?view=diff&rev=60012&r1=60011&r2=60012
==============================================================================
--- branches/1.2/mkpkgconfig (original)
+++ branches/1.2/mkpkgconfig Tue Apr  3 17:54:49 2007
@@ -5,6 +5,13 @@
 if [ "x$ASTERISKVERSIONNUM" = "x" ]; then
   echo " ** Do not call this script directly"
   exit
+fi
+
+if uname -a | grep -q Darwin
+then
+  SEDARG=-E
+else
+  SEDARG=-r
 fi
 
 ## Create a pkgconfig spec file for 3rd party modules (pkg-config asterisk --cflags)
@@ -16,10 +23,10 @@
 ## Clean out CFLAGS for the spec file.
 
 LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \
-  sed -r -e 's/-I(include|\.\.\/include) //g' | \
+  sed $SEDARG -e 's/-I(include|\.\.\/include) //g' | \
   sed -e 's/-DINSTALL_PREFIX=\S* //g' | \
-  sed -r -e 's/-DASTERISK_VERSION=\S* //g' | \
-  sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
+  sed $SEDARG -e 's/-DASTERISK_VERSION=\S* //g' | \
+  sed $SEDARG -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
 
 
 cat <<EOF > $PPATH/asterisk.pc



More information about the svn-commits mailing list