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: https://origsvn.digium.com/svn/asterisk/trunk@259760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2010-04-28 19:19:54 +00:00
parent dc9295da58
commit 038af9fada
3 changed files with 2 additions and 48 deletions

View File

@@ -85,7 +85,6 @@ export STRIP
export DOWNLOAD
export AWK
export GREP
export ID
export MD5
export WGET_EXTRA_ARGS
@@ -490,9 +489,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.