aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-27 20:11:26 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-27 20:11:26 +0000
commit8db2b1e866313376c8cce7ed1c9948e6557bffd9 (patch)
treec0ae1cb0f34565bf91e4cd77c3035f16bfc1b640
parent66ef026c470588ba53beead52c8b11a8ff3b0d20 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@197263 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 378865aa5..980f75f40 100644
--- a/Makefile
+++ b/Makefile
@@ -472,7 +472,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.