[asterisk-commits] seanbright: trunk r220100 - in /trunk: ./ Makefile build_tools/mkpkgconfig

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Sep 24 09:44:08 2009
New Revision: 220100

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220100
Log:
Merged revisions 220099 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r220099 | seanbright | 2009-09-24 10:41:57 -0400 (Thu, 24 Sep 2009) | 2 lines
  
  Remove the remaining bashisms in the Makefile/mkpkgconfig
........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/build_tools/mkpkgconfig

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=220100&r1=220099&r2=220100
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Sep 24 09:44:08 2009
@@ -474,7 +474,9 @@
 	rm -f build_tools/menuselect-deps
 
 datafiles: _all
-	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+	if [ `$(ID) -u` = 0 ]; then \
+		CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \
+	fi
 # Should static HTTP be installed during make samples or even with its own target ala
 # webvoicemail?  There are portions here that *could* be customized but might also be
 # improved a lot.  I'll put it here for now.

Modified: trunk/build_tools/mkpkgconfig
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/mkpkgconfig?view=diff&rev=220100&r1=220099&r2=220100
==============================================================================
--- trunk/build_tools/mkpkgconfig (original)
+++ trunk/build_tools/mkpkgconfig Thu Sep 24 09:44:08 2009
@@ -14,7 +14,7 @@
 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
+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"