From: Sean Bright Date: Wed, 27 May 2009 20:11:01 +0000 (+0000) Subject: Merged revisions 197260 via svnmerge from X-Git-Tag: 1.6.1.3-rc1~206 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9753651b3a69a7dbb5f33d18c5ee7cb22a510c18;p=thirdparty%2Fasterisk.git Merged revisions 197260 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r197260 | seanbright | 2009-05-27 16:08:16 -0400 (Wed, 27 May 2009) | 6 lines Use bash explicitly when calling build_tools/mkpkgconfig from the Makefile. Since we use bashisms in build_tools/mkpkgconfig, we should call on bash explicitly when running from the Makefile, otherwise we get errors during a 'make install.' (closes issue #15209) Reported by: seandarcy ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@197262 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index 444a7e476a..48dfa29a86 100644 --- a/Makefile +++ b/Makefile @@ -465,7 +465,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean rm -f build_tools/menuselect-deps datafiles: _all - if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi + if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" bash 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.