automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11658 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 3b2b7bd4f9e60b7c62bc2a047726141a290802e2..28c76cf942c2c31f7142f7557f5475577dd8d808 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -543,7 +543,7 @@ clean:
        $(MAKE) -C stdtime clean
 
 datafiles: all
-       if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+       if [ x`id -un` = xroot ]; then sh 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 cd6391a8833e77d3eb84a8cf834869f32111c725..a9b04198564c9009d61ad5c8af2d88d42044cca9 100755 (executable)
--- 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
 /*