dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@220100 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
seanbright 2009-09-24 14:44:08 +00:00
parent 28f23fa638
commit ebb32104ea
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

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

2
build_tools/mkpkgconfig
View File

@ -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"