[asterisk-commits] murf: branch murf/AAL r42078 - /team/murf/AAL/build_tools/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Tue Sep  5 16:36:23 2006
New Revision: 42078

URL: http://svn.digium.com/view/asterisk?rev=42078&view=rev
Log:
Just trying to update this old branch. Hmmm.


Modified:
    team/murf/AAL/build_tools/make_buildopts_h
    team/murf/AAL/build_tools/mkpkgconfig

Modified: team/murf/AAL/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/murf/AAL/build_tools/make_buildopts_h?rev=42078&r1=42077&r2=42078&view=diff
==============================================================================
--- team/murf/AAL/build_tools/make_buildopts_h (original)
+++ team/murf/AAL/build_tools/make_buildopts_h Tue Sep  5 16:36:23 2006
@@ -7,7 +7,7 @@
  */
 
 END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g`
+TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
 for x in ${TMP}; do
      echo "#define ${x} 1"
 done

Modified: team/murf/AAL/build_tools/mkpkgconfig
URL: http://svn.digium.com/view/asterisk/team/murf/AAL/build_tools/mkpkgconfig?rev=42078&r1=42077&r2=42078&view=diff
==============================================================================
--- team/murf/AAL/build_tools/mkpkgconfig (original)
+++ team/murf/AAL/build_tools/mkpkgconfig Tue Sep  5 16:36:23 2006
@@ -13,13 +13,20 @@
   exit
 fi
 
+#Solaris (and some others) don't have sed -r.  perl -p is equivalent
+if [[ `echo "xxx" | sed -r 's/x/y/g' 2>/dev/null | grep -c "yyy"` != 0 ]]; then
+    EXTREGEX="sed -r -e"
+else
+    EXTREGEX="perl -pe"
+fi
+
 ## 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 -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'`
+LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \
+  ${EXTREGEX} 's/-I(include|\.\.\/include) //g' | \
+  ${EXTREGEX} 's/-DINSTALL_PREFIX=\S* //g' | \
+  ${EXTREGEX} 's/-DASTERISK_VERSION=\S* //g' | \
+  ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
 
 
 cat <<EOF > $PPATH/asterisk.pc