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
This commit is contained in:
parent
b1f1666b37
commit
9c23d0690b
4
Makefile
4
Makefile
|
@ -474,7 +474,9 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
|
||||||
rm -f build_tools/menuselect-deps
|
rm -f build_tools/menuselect-deps
|
||||||
|
|
||||||
datafiles: _all
|
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
|
# 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
|
# webvoicemail? There are portions here that *could* be customized but might also be
|
||||||
# improved a lot. I'll put it here for now.
|
# improved a lot. I'll put it here for now.
|
||||||
|
|
|
@ -14,7 +14,7 @@ if [ ! -d $PPATH ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Solaris (and some others) don't have sed -r. perl -p is equivalent
|
#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"
|
EXTREGEX="sed -r -e"
|
||||||
else
|
else
|
||||||
EXTREGEX="perl -pe"
|
EXTREGEX="perl -pe"
|
||||||
|
|
Loading…
Reference in New Issue