diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-28 19:23:50 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-28 19:23:50 +0000 |
commit | f95831e4b1392b284431a1f8a08d0b1675b40164 (patch) | |
tree | ea3c146f288c691576504d7c1056ac18692160ac /Makefile | |
parent | 94881743bcc2b9197afa376e447362453be10d6b (diff) |
Merged revisions 259760 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r259760 | qwell | 2010-04-28 14:19:54 -0500 (Wed, 28 Apr 2010) | 14 lines
Merged revisions 259748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r259748 | qwell | 2010-04-28 14:17:38 -0500 (Wed, 28 Apr 2010) | 7 lines
Remove usage of `id` since it isn't useful and was causing breakge.
Solaris `id` doesn't support the -u argument. Instead of figuring out how to
fix this to work on Solaris, I decided to check why it was necessary and where
else it was used. It was only used in one place, and it hasn't been needed
for a very long time (I question whether it was ever needed).
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@259781 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -85,7 +85,6 @@ export STRIP export DOWNLOAD export AWK export GREP -export ID export MD5 export WGET_EXTRA_ARGS @@ -477,9 +476,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean rm -f build_tools/menuselect-deps datafiles: _all - if [ `$(ID) -u` = 0 ]; then \ - CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \ - fi + CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; # 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. |