From: Sean Bright <sean@malleable.com>
Date: Thu, 24 Sep 2009 14:49:35 +0000 (+0000)
Subject: Merged revisions 220100 via svnmerge from
X-Git-Tag: 1.6.1.7-rc2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20f65270c6e0bc91f9fbf70bd078f1cf4625b54e;p=thirdparty%2Fasterisk.git

Merged revisions 220100 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220100 | seanbright | 2009-09-24 10:44:08 -0400 (Thu, 24 Sep 2009) | 9 lines

  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
  ........
................


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

diff --git a/Makefile b/Makefile
index 74457a3ae7..d201a27eff 100644
--- a/Makefile
+++ b/Makefile
@@ -463,7 +463,9 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
 	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.
diff --git a/build_tools/mkpkgconfig b/build_tools/mkpkgconfig
index 919c6e816f..522afba870 100755
--- a/build_tools/mkpkgconfig
+++ b/build_tools/mkpkgconfig
@@ -14,7 +14,7 @@ if [ ! -d $PPATH ]; then
 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"