diff options
| author | Sean Bright <sean@malleable.com> | 2009-09-24 14:44:08 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2009-09-24 14:44:08 +0000 |
| commit | 9c23d0690bfbcd021dcf546db742d41a63d61f85 (patch) | |
| tree | b27a361caf92bcb4d8f896fc476ccb45436d6905 | |
| parent | b1f1666b376f60ed9ef2120252aa62c45454ab12 (diff) | |
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/trunk@220100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | build_tools/mkpkgconfig | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -474,7 +474,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 919c6e816..522afba87 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" |