From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 3 Mar 2006 00:41:19 +0000 (+0000)
Subject: Merged revisions 11634-11635 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2497
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffe5ffda175f191941b0cf9200d55c83b96def76;p=thirdparty%2Fasterisk.git

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 7414befbb0..6037dea8b2 100644
--- a/Makefile
+++ b/Makefile
@@ -554,7 +554,7 @@ clean: clean-depend
 	$(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 \
diff --git a/build_tools/make_build_h b/build_tools/make_build_h
index cd6391a883..a9b0419856 100755
--- a/build_tools/make_build_h
+++ b/build_tools/make_build_h
@@ -3,7 +3,7 @@ HOSTNAME=`uname -n`
 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
 /*