[svn-commits] qwell: branch 1.6.0 r259770 - /branches/1.6.0/

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Apr 28 14:21:45 2010
New Revision: 259770

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=259770
Log:
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).
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile
    branches/1.6.0/configure
    branches/1.6.0/configure.ac

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile?view=diff&rev=259770&r1=259769&r2=259770
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Wed Apr 28 14:21:45 2010
@@ -85,7 +85,6 @@
 export DOWNLOAD
 export AWK
 export GREP
-export ID
 export MD5
 export WGET_EXTRA_ARGS
 
@@ -465,9 +464,7 @@
 	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.

Modified: branches/1.6.0/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configure.ac?view=diff&rev=259770&r1=259769&r2=259770
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Wed Apr 28 14:21:45 2010
@@ -177,7 +177,6 @@
 AC_PATH_PROG([FIND], [find], :)
 AC_PATH_PROG([COMPRESS], [compress], :)
 AC_PATH_PROG([BASENAME], [basename], :)
-AC_PATH_PROG([ID], [id], :)
 AC_PATH_PROG([DIRNAME], [dirname], :)
 AC_PATH_PROG([SHELL], [sh], :)
 AC_PATH_PROG([LN], [ln], :)