diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 14:49:37 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 14:49:37 +0000 |
| commit | 7a49bdcc90004d924d9d4caba2278c559cbfca66 (patch) | |
| tree | 153028abcb4d10277f180df9473b7df1dcb23c34 /Makefile | |
| parent | d08d3de3d7cabcc7ae467b93e1fbbfa2f7bcefdc (diff) | |
Merged revisions 220100 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r220100 | seanbright | 2009-09-24 10:44:08 -0400 (Thu, 24 Sep 2009) | 9 lines
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/branches/1.6.2@220103 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -470,7 +470,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. |