[asterisk-commits] trunk r11636 - in /trunk: ./ Makefile build_tools/make_build_h

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Thu Mar  2 18:41:19 2006
New Revision: 11636

URL: http://svn.digium.com/view/asterisk?rev=11636&view=rev
Log:
Merged revisions 11634-11635 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r11634 | tilghman | 2006-03-02 18:34:52 -0600 (Thu, 02 Mar 2006) | 2 lines

Bug 6638 - Change from a historic BSD command to a POSIX command for determining username

........
r11635 | tilghman | 2006-03-02 18:38:14 -0600 (Thu, 02 Mar 2006) | 2 lines

Bug 6638 - Use POSIX command for Solaris

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/build_tools/make_build_h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=11636&r1=11635&r2=11636&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Mar  2 18:41:19 2006
@@ -554,7 +554,7 @@
 	$(MAKE) -C stdtime clean
 
 datafiles: all
-	if [ x`whoami` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+	if [ x`id -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \

Modified: trunk/build_tools/make_build_h
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_build_h?rev=11636&r1=11635&r2=11636&view=diff
==============================================================================
--- trunk/build_tools/make_build_h (original)
+++ trunk/build_tools/make_build_h Thu Mar  2 18:41:19 2006
@@ -3,7 +3,7 @@
 KERNEL=`uname -r`
 MACHINE=`uname -m`
 OS=`uname -s`
-USER=`whoami`
+USER=`id -un`
 DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
 cat << END
 /*